opendev
/
system-config
Code Issues Proposed changes

Add a node pattern for precise3k slaves. 

* manifests/site.pp: Add a node pattern for slave servers which run
Ubuntu Precise Pangolin and default to Python 3.3 for the Puppet PIP
package provider.

* launch/README: Starting with precise3k slaves, individual Puppet
certificates will now be used per-server.

Change-Id: I2cde440720afd8014fc98dfd133d29a428751a9d
This commit is contained in:
Jeremy Stanley 2013-07-18 02:37:29 +00:00
parent 3673a46999
commit fe2a4cd0a6
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launch/README
View File

@ -23,21 +23,21 @@ To launch a node in the OpenStack Jenkins account (slave nodes)::
. ~root/ci-launch/openstackjenkins-rs-nova.sh
export FQDN=slavename.slave.openstack.org
export CERT=slavetype.slave.openstack.org
nova image-list
export IMAGE='Ubuntu 12.04 LTS (Precise Pangolin)'
nova flavor-list
export RAM=8192
sudo puppet cert generate $CERT
./launch-node.py $FQDN --cert $CERT.pem --image "$IMAGE" --ram $RAM
sudo puppet cert generate $FQDN
./launch-node.py $FQDN --image "$IMAGE" --ram $RAM
If you are launching a replacement server, you may skip the generate
step and specify the name of an existing puppet cert (as long as the
private key is on this host).
The server name and cert names may be different (as in the Jenkins
slave example), but launch-node.py will assume they are the same
unless specified.
The server name and cert names may be different and the latter can be
specified with --cert if needed (older Jenkins slave types still use
shared certs), but launch-node.py will assume they are the same unless
specified.
Manually add the hostname to DNS (the launch script does not do so
automatically). Note that this example assumes you've already

20
manifests/site.pp
View File

@ -414,6 +414,26 @@ node /^precise-dev\d+.*\.slave\.openstack\.org$/ {
}
}
node /^precise3k-?\d+.*\.slave\.openstack\.org$/ {
include openstack_project
include openstack_project::puppet_cron
class { 'openstack_project::slave':
ssh_key => $openstack_project::jenkins_ssh_key,
sysadmins => hiera('sysadmins'),
python3 => true,
}
}
node /^precise3k-dev\d+.*\.slave\.openstack\.org$/ {
include openstack_project
include openstack_project::puppet_cron
class { 'openstack_project::slave':
ssh_key => $openstack_project::jenkins_dev_ssh_key,
sysadmins => hiera('sysadmins'),
python3 => true,
}
}
node /^centos6-?\d+\.slave\.openstack\.org$/ {
include openstack_project
include openstack_project::puppet_cron