Merge pull request #361 from sdodson/bz1162052

Fix GSS-TSIG nsupdate

Author: sdodson

manifests/plugins/dns/nsupdate.pp

@@ -29,8 +29,8 @@
     warning "Use the last field in the generated key file /var/named/K${openshift_origin::domain}*.key"
     fail 'bind_key is required.'
   }
-  if !$::openshift_origin::bind_krb_principal == '' and $::openshift_origin::bind_krb_keytab == '' {
-    warning "Kerberos keytab for the DNS service was not found. Please generate a keytab for DNS/${::openshift_origin::nameserver_fqdn}"
+  if $::openshift_origin::bind_krb_principal != '' and $::openshift_origin::bind_krb_keytab == '' {
+    warning "Kerberos keytab for the DNS service was not set. Please generate a keytab for DNS/${::openshift_origin::nameserver_fqdn} and provide a path for the keytab."
     fail 'bind_krb_keytab is required.'
   }
 
@@ -41,7 +41,7 @@
     ],
   }
 
-  if !$::openshift_origin::bind_krb_principal == '' {
+  if $::openshift_origin::bind_krb_principal != '' {
     file { 'broker-dns-keytab':
       ensure  => present,
       path    => $::openshift_origin::bind_krb_keytab,

manifests/register_dns.pp

@@ -13,7 +13,7 @@
 #  limitations under the License.
 #
 class openshift_origin::register_dns {
-  if $::openshift_origin::register_host_with_nameserver {
+  if $::openshift_origin::register_host_with_nameserver and $::openshift_origin::bind_krb_principal == '' {
     if $::fqdn != 'localhost' {
       package { 'bind-utils' :
           ensure  => present,
@@ -47,5 +47,9 @@
         require  => Package['bind-utils'],
       }
     }
+  } elsif $::openshift_origin::register_host_with_nameserver and $::openshift_origin::bind_krb_principal != '' {
+    warning "You cannot use register_host_with_nameserver when using GSS-TSIG DNS updates"
+    fail "You cannot use register_host_with_nameserver when using GSS-TSIG DNS updates"
   }
+
 }