Merge pull request #363 from sdodson/bz1160099

sdodson · sdodson · commit 1da0a4015d99 · 2014-12-10T11:32:46.000-05:00
Ensure that openshift_origin::nameserver completes before registering dn...
diff --git a/manifests/role/nameserver.pp b/manifests/role/nameserver.pp
@@ -14,8 +14,10 @@
 #
 class openshift_origin::role::nameserver inherits openshift_origin::role {
   include openshift_origin::nameserver
+  include openshift_origin::register_dns
 
   anchor { 'openshift_origin::nameserver_role_begin': } ->
   Class['openshift_origin::nameserver'] ->
-  anchor { 'openshift_origin::nameserver_role_end': }
+  anchor { 'openshift_origin::nameserver_role_end': } ->
+  Class['openshift_origin::register_dns']
 }

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,10 @@`
`14`	`14`	`#`
`15`	`15`	`class openshift_origin::role::nameserver inherits openshift_origin::role {`
`16`	`16`	`include openshift_origin::nameserver`
	`17`	`+ include openshift_origin::register_dns`
`17`	`18`
`18`	`19`	`anchor { 'openshift_origin::nameserver_role_begin': } ->`
`19`	`20`	`Class['openshift_origin::nameserver'] ->`
`20`		`- anchor { 'openshift_origin::nameserver_role_end': }`
	`21`	`+ anchor { 'openshift_origin::nameserver_role_end': } ->`
	`22`	`+ Class['openshift_origin::register_dns']`
`21`	`23`	`}`