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

Author: detiber

manifests/nameserver.pp

@@ -110,7 +110,6 @@
       group   => 'named',
       mode    => '0644',
       content => template('openshift_origin/named/oo_infrastructure.conf.erb'),
-      replace => false,
       require => File['/var/named']
     }
 
@@ -142,7 +141,6 @@
   } else {
     file { 'empty infrastructure host configuration':
       ensure  => present,
-      replace => false,
       path    => '/var/named/oo_infrastructure.conf',
       owner   => 'root',
       group   => 'named',

manifests/register_dns.pp

@@ -27,7 +27,7 @@
         $::openshift_origin::domain)
       $key_argument="${key_algorithm}:${key_domain}:${key_secret}"
 
-      exec { "Register ${::fqdn}" :
+      exec { "Attempting to register host dns" :
         command   => template('openshift_origin/register_dns.erb'),
         provider  => 'shell',
         require   => Package['bind-utils'],

templates/named/oo_infrastructure.conf.erb

@@ -1,4 +1,7 @@
 // define a zone for infrastructure hosts
+<% unless scope.lookupvar('::openshift_origin::dns_infrastructure_key').empty? -%>
+include "<%= scope.lookupvar('::openshift_origin::dns_infrastructure_zone') %>.key";
+<% end -%>
 
 zone "<%= scope.lookupvar('::openshift_origin::dns_infrastructure_zone') %>" IN {
     type master;