Merge "Make the salt master also a minion"

2013-10-07 23:43:57 +00:00 · 2013-10-07 23:43:57 +00:00 · 5de6d43f5c
commit 5de6d43f5c
parent 8d63daca3e 5df6c98934
1 changed files with 3 additions and 0 deletions
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@ -8,6 +8,9 @@ class openstack_project::puppetmaster (
    sysadmins                 => $sysadmins,
  }

+  class { 'salt':
+    salt_master => 'ci-puppetmaster.openstack.org',
+  }
  class { 'salt::master': }

  cron { 'updatepuppetmaster':