For now don't allow registering host dns entries when using GSS-TSIG auth

sdodson · sdodson · commit 155ce511dfe3 · 2014-12-05T13:31:45.000-05:00
diff --git a/manifests/register_dns.pp b/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"
   }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`	`#`
`15`	`15`	`class openshift_origin::register_dns {`
`16`		`- if $::openshift_origin::register_host_with_nameserver {`
	`16`	`+ if $::openshift_origin::register_host_with_nameserver and $::openshift_origin::bind_krb_principal == '' {`
`17`	`17`	`if $::fqdn != 'localhost' {`
`18`	`18`	`package { 'bind-utils' :`
`19`	`19`	`ensure => present,`
`@@ -47,5 +47,9 @@`
`47`	`47`	`require => Package['bind-utils'],`
`48`	`48`	`}`
`49`	`49`	`}`
	`50`	`+ } elsif $::openshift_origin::register_host_with_nameserver and $::openshift_origin::bind_krb_principal != '' {`
	`51`	`+ warning "You cannot use register_host_with_nameserver when using GSS-TSIG DNS updates"`
	`52`	`+ fail "You cannot use register_host_with_nameserver when using GSS-TSIG DNS updates"`
`50`	`53`	`}`
	`54`	`+`
`51`	`55`	`}`