Quickfix for cartridge-dependencies packages
Merge branch 'add-openshift-origin-cartridge-dependencies' of github.com:andrewklau/puppet-openshift_origin into add-openshift-origin-cartridge-dependencies

Conflicts:
	manifests/init.pp
Merge pull request #338 from sdodson/add-openshift-origin-cartridge-dependencies

Add openshift origin cartridge dependencies

Going ahead with it as is. We can revisit different implementation details in the future if this turns out to be confusing to users.
fixes for register_dns

- do not attempt to update dns records for hosts that are not a member
  of the host domain ($dns_infrastructure_zone if set, otherwise
  $domain)
- fix bug where nsupdate was being run against the $domain variable
  if $dns_infrastructure_zone is set.
- remove extra spaces output from register_dns.erb template
Fix GSS-TSIG dns authentication

Somewhere along the way broker_dns_gsstsig class parameter got refactored out by mistake so we were never
attempting to deploy a kerberos based nsupdate config.

Fixed by :
  * Using kerberos nsupdate config whenever bind_krb_principal != ''
  * Remove the composition of "DNS/$bind_krb_principal@$broker_krb_auth_realms" because folks may use
  different realms for broker and dns auth. Also, we're naming the variable 'principal' so lets just have
  users provide a principal. There's risk here that folks would expect the previous behaviour, but given that
  the code path would never have been executed as it was I think this is a sane change.
Refactor openshift-origin-dns-nsupdate.conf creation
Merge pull request #341 from sdodson/bz1162052

Fix GSS-TSIG dns authentication
Merge pull request #339 from detiber/register_dns_fixes

fixes for register_dns
Version 4.1.0
Merge pull request #343 from sdodson/v4_1_0

Version 4.1.0
Create /etc/openshift/development when development_mode = true

This file is necessary to trigger console and broker applications to run inside a development, versus
production, rails environment. This file also triggers additional logging for gear placement and other
plugins.
Version 4.1.1

Re-introduce Modulefile. It's necessary to build the module on puppet 2.7 but not while installing it.
Merge pull request #346 from sdodson/v4_1_1

Version 4.1.1
Merge pull request #345 from sdodson/bz1161486

Create /etc/openshift/development when development_mode = true
Bug 1162093 - infrastructure dns improvements

https://bugzilla.redhat.com/show_bug.cgi?id=1162093

- include the dns_infrastructure_key in oo_instrastructure.conf
- Allow changes to oo_infrastructure.conf file
- No longer reference fqdn fact in register_dns
Add comments to templates stating that they are managed by puppet
Bug 1162901 - ensure correct dns key algo used

https://bugzilla.redhat.com/show_bug.cgi?id=1162901

- Previously register_dns.pp used pick to choose between
  bind_key_algorithm and dns_infrastructure_key_algorithm, but since
  they both had default values of HMAC-MD5,
  dns_infrastructure_key_algorithm was always used.
Bug 1162454 - default hostnames should use infra zone if provided

https://bugzilla.redhat.com/show_bug.cgi?id=1162454

- If no hostname is provided and dns_infrastructure_zone is configured
  the default hostnames should use dns_infrastructure_zone instead of
  domain variable