Merge "Make the salt master also a minion"
This commit is contained in:
commit
5de6d43f5c
@ -8,6 +8,9 @@ class openstack_project::puppetmaster (
|
|||||||
sysadmins => $sysadmins,
|
sysadmins => $sysadmins,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class { 'salt':
|
||||||
|
salt_master => 'ci-puppetmaster.openstack.org',
|
||||||
|
}
|
||||||
class { 'salt::master': }
|
class { 'salt::master': }
|
||||||
|
|
||||||
cron { 'updatepuppetmaster':
|
cron { 'updatepuppetmaster':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user