opendev/system-config
Code Issues Proposed changes

Install salt master and add minions.

Browse Source 
Install a salt master on the puppetmaster node and turn permanent
jenkins slaves into salt minions.

Change-Id: Ib7cba747ee545481a4d97d78ce6009cf5bb2374d
Reviewed-on: https://review.openstack.org/14303
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-10-10 11:20:02 -07:00 committed by Jenkins
parent ad5ddbb2a4
commit 002c77b547
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -2,10 +2,12 @@ class openstack_project::puppetmaster (
$sysadmins = [] $sysadmins = []
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [8140], iptables_public_tcp_ports => [4505, 4506, 8140],
sysadmins => $sysadmins sysadmins => $sysadmins
} }
class { 'salt::master': }
cron { 'updatepuppetmaster': cron { 'updatepuppetmaster':
user => 'root', user => 'root',
minute => '*/15', minute => '*/15',

3
modules/openstack_project/manifests/slave.pp
View File

@ -13,4 +13,7 @@ class openstack_project::slave (
class { 'jenkins::slave': class { 'jenkins::slave':
ssh_key => $openstack_project::jenkins_ssh_key ssh_key => $openstack_project::jenkins_ssh_key
} }
class { 'salt':
salt_master => 'ci-puppetmaster.openstack.org',
}
} }