From 86b0f3bfd5505f9943db5801b81f70f7e44b8e82 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 20 Aug 2013 19:58:38 -0700 Subject: [PATCH] Fix nodepool setup scripts The devstack cache steps were being run as the ubuntu user; make sure they are run as jenkins. Also update the nodepool configuration file to current values and include the jenkins credential id. Change-Id: Icbe8bee3b1800e28034cd36d4d328a6793d55b0e --- manifests/site.pp | 1 + .../files/nodepool/scripts/prepare_devstack.sh | 4 ++-- .../files/nodepool/scripts/prepare_node.sh | 2 +- .../files/nodepool/scripts/prepare_node_devstack.sh | 2 +- modules/openstack_project/manifests/nodepool.pp | 1 + .../templates/nodepool/nodepool.yaml.erb | 9 ++++++--- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index fd7384356f..87ee069150 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -329,6 +329,7 @@ node 'nodepool.openstack.org' { statsd_host => 'graphite.openstack.org', jenkins_api_user => hiera('jenkins_api_user'), jenkins_api_key => hiera('jenkins_api_key'), + jenkins_credentials_id => hiera('jenkins_credentials_id'), rackspace_username => hiera('nodepool_rackspace_username'), rackspace_password => hiera('nodepool_rackspace_password'), rackspace_project => hiera('nodepool_rackspace_project'), diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh b/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh index 68b9587391..855b0eea8b 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_devstack.sh @@ -26,7 +26,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get \ rm -rf ~/workspace-cache mkdir -p ~/workspace-cache -pushd ~/workspace-cache +cd ~/workspace-cache git clone https://review.openstack.org/p/openstack-dev/devstack git clone https://review.openstack.org/p/openstack-dev/grenade git clone https://review.openstack.org/p/openstack-dev/pbr @@ -54,9 +54,9 @@ git clone https://review.openstack.org/p/openstack/python-swiftclient git clone https://review.openstack.org/p/openstack/requirements git clone https://review.openstack.org/p/openstack/swift git clone https://review.openstack.org/p/openstack/tempest -popd . /etc/lsb-release +cd /opt/nodepool-scripts/ python ./devstack-cache.py $DISTRIB_CODENAME sync diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh index 5457663083..faa83f6f96 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh @@ -24,7 +24,7 @@ sudo bash -xe install_puppet.sh sudo git clone https://review.openstack.org/p/openstack-infra/config.git \ /root/config sudo /bin/bash /root/config/install_modules.sh -if [ -z $NODEPOOL_SSH_KEY ] ; then +if [ -z "$NODEPOOL_SSH_KEY" ] ; then sudo puppet apply --modulepath=/root/config/modules:/etc/puppet/modules \ -e "class {'openstack_project::slave_template': }" else diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh index 094df63fc3..2abc3d46b2 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node_devstack.sh @@ -19,4 +19,4 @@ HOSTNAME=$1 ./prepare_node.sh $HOSTNAME -./prepare_devstack.sh $HOSTNAME +sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh $HOSTNAME diff --git a/modules/openstack_project/manifests/nodepool.pp b/modules/openstack_project/manifests/nodepool.pp index c5db247a12..11aeaedb39 100644 --- a/modules/openstack_project/manifests/nodepool.pp +++ b/modules/openstack_project/manifests/nodepool.pp @@ -8,6 +8,7 @@ class openstack_project::nodepool( $statsd_host = '', $jenkins_api_user ='', $jenkins_api_key ='', + $jenkins_credentials_id ='', $rackspace_username ='', $rackspace_password ='', $rackspace_project ='', diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 392cbe705e..b2d7566b05 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -3,6 +3,7 @@ dburi: 'mysql://nodepool:<%= mysql_password %>@localhost/nodepool' cron: cleanup: '*/5 * * * *' + check: '*/15 * * * *' update-image: '14 2 * * *' zmq-publishers: @@ -46,7 +47,7 @@ providers: password: '<%= hpcloud_password %>' project-id: '<%= hpcloud_project %>' auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0' - max-servers: 93 + max-servers: 83 images: - name: devstack-precise base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)' @@ -60,7 +61,7 @@ providers: password: '<%= hpcloud_password %>' project-id: '<%= hpcloud_project %>' auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0' - max-servers: 93 + max-servers: 83 images: - name: devstack-precise base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)' @@ -74,7 +75,7 @@ providers: password: '<%= hpcloud_password %>' project-id: '<%= hpcloud_project %>' auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0' - max-servers: 93 + max-servers: 83 images: - name: devstack-precise base-image: 'Ubuntu Precise 12.04 LTS Server 64-bit 20121026 (b)' @@ -87,6 +88,7 @@ targets: url: 'https://jenkins01.openstack.org/' user: '<%= jenkins_api_user %>' apikey: '<%= jenkins_api_key %>' + credentials-id: '<%= jenkins_credentials_id %>' images: - name: devstack-precise providers: @@ -101,6 +103,7 @@ targets: url: 'https://jenkins02.openstack.org/' user: '<%= jenkins_api_user %>' apikey: '<%= jenkins_api_key %>' + credentials-id: '<%= jenkins_credentials_id %>' images: - name: devstack-precise providers: