openstack
/
devstack-gate
Code Issues Proposed changes

allow injection of SSH keys into Jenkins user 

The SSH key in the openstack-ci-puppet repo will be used by default,
unless the JENKINS_SSH_KEY env var is present, in which case that
will be used instead.

Change-Id: If61b10679940f632f49a09fe6f320c82f2a4c25d
This commit is contained in:
Devananda van der Veen 2012-08-09 10:56:52 -07:00
parent efdcd2b9b1
commit 4e0cb89d12
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -225,12 +225,13 @@ you're working as is called "jenkins"):
python vmdatabase.py
sqlite3 /home/jenkins/vm.db
Currently the update-image script will produce a VM that only members
of the OpenStack CI team can log into. You should start by patching
devstack-vm-update-image.py to have an option to install your own
local ssh key, and if you don't want to use the "jenkins" user, it
should also create whatever user you want to use. Send that patch
upstream to us so it can be merged. Then run:
By default, the update-image script will produce a VM that only members
of the OpenStack CI team can log into. You can inject your SSH public
key by setting the appropriate env variable, like so:
export JENKINS_SSH_KEY=$(head -1 ~/.ssh/authorized_keys)
Then run:
./devstack-vm-update-image.sh <YOUR PROVIDER NAME>
./devstack-vm-launch.py <YOUR PROVIDER NAME>

17
devstack-vm-update-image.py
View File

@ -36,6 +36,13 @@ DEVSTACK_GATE_PREFIX = os.environ.get('DEVSTACK_GATE_PREFIX', '')
DEVSTACK = os.path.join(WORKSPACE, 'devstack')
PROVIDER_NAME = sys.argv[1]
JENKINS_SSH_KEY = os.environ.get('JENKINS_SSH_KEY', False)
if JENKINS_SSH_KEY:
PUPPET_CLASS="class {'openstack_project::slave_template': "
" install_users => false, ssh_key => '%s' }" % JENKINS_SSH_KEY
else:
PUPPET_CLASS="class {'openstack_project::slave_template': }"
PROJECTS = ['openstack/nova',
'openstack/glance',
'openstack/keystone',
@ -154,7 +161,7 @@ def bootstrap_server(provider, server, admin_pass, key):
'openstack-ci-puppet.git'
client.ssh("set hostname", "sudo hostname %s" % server.name)
client.ssh("get puppet repo deb",
"/usr/bin/wget "
"sudo /usr/bin/wget "
"http://apt.puppetlabs.com/puppetlabs-release-"
"`lsb_release -c -s`.deb -O /root/puppet-repo.deb")
client.ssh("install puppet repo deb", "sudo dpkg -i /root/puppet-repo.deb")
@ -169,10 +176,12 @@ def bootstrap_server(provider, server, admin_pass, key):
' --assume-yes install git puppet')
client.ssh("clone puppret repo",
"sudo git clone %s /root/openstack-ci-puppet" % gerrit_url)
client.ssh("install puppet modules",
"/bin/bash /root/openstack-ci-puppet/install_modules.sh")
client.ssh("run puppet",
"sudo puppet apply "
"--modulepath=/root/openstack-ci-puppet/modules "
"/root/openstack-ci-puppet/manifests/site.pp")
"sudo puppet apply --modulepath=/root/openstack-ci-puppet/modules:"
"/etc/puppet/modules "
"-e '%s'" % PUPPET_CLASS)
def configure_server(server, branches):