Make the salt master also a minion

* modules/openstack_project/manifests/puppetmaster.pp: We need to be
able to trigger git pull of one or more repos on the puppet master,
which is also the salt master. The most convenient way to do this is
to make the master also a minion, so it can trigger execution of
things on itself.

Change-Id: Ic5b1d9f69617db345161dc6181799e6575b4e037
This commit is contained in:
Jeremy Stanley 2013-10-01 19:08:30 +00:00
parent 4ba760b81b
commit 5df6c98934

View File

@ -8,6 +8,9 @@ class openstack_project::puppetmaster (
sysadmins => $sysadmins,
}
class { 'salt':
salt_master => 'ci-puppetmaster.openstack.org',
}
class { 'salt::master': }
cron { 'updatepuppetmaster':