a few minor changes

1 files changed, 21 insertions, 1 deletions

diff --git a/ci-deploy/2-setup-ext-testing-master.sh b/ci-deploy/2-setup-ext-testing-master.sh
index 5fcd155..09f80df 100755
--- a/ci-deploy/2-setup-ext-testing-master.sh
+++ b/ci-deploy/2-setup-ext-testing-master.sh
@@ -16,25 +16,40 @@ scp_plugin_url=http://people.linaro.org/~clark.laughlin/openstack-jenkins-ci/scp
 keystone_ip=`juju status keystone/0 | grep public-address | awk '{ print $2 }'`
 echo "keystone is at [${keystone_ip}]"
 
+#
 # install some necessary dependencies
+#
+
 juju ssh ${machine} "sudo apt-get -y install wget openssl ca-certificates ssl-cert"
 
+#
 # clone the data repo locally to handle all authentication here, then package up and copy to the
 # target machine
+#
+
 git clone ${config_repo} __data
+
 # replace the keystone_ip placeholder
 sed --in-place=-orig -e 's/##KEYSTONEIP##/'${keystone_ip}'/' __data/etc/nodepool/nodepool.yaml.erb
 tar cfz __data.tgz __data
 juju scp __data.tgz ${machine}:~
+
+# add the jenkins key to the cloud
+juju scp __data/jenkins_key.pub nova-cloud-controller/0:~    
+juju ssh nova-cloud-controller/0 ". ./stackrc ; nova keypair-add --pub-key jenkins_key.pub jenkins ; nova keypair-list"
+
+# clean up the local copy of the data
 rm -rf __data
 rm __data.tgz
 
+#
 # expand the data on the target machine, then retrieve the installation script and launch it
+#
+
 juju ssh ${machine} "tar xf __data.tgz ; mv __data os-ext-testing-data ; wget ${install_script_url}"
 juju ssh ${machine} "bash ./install_master.sh | tee install.log"
 
 # install scp plugin and restart jenkins
-
 juju ssh ${machine} "sleep 60 ; wget http://localhost:8080/jnlpJars/jenkins-cli.jar"
 juju ssh ${machine} "java -jar jenkins-cli.jar -s http://localhost:8080/ install-plugin ${scp_plugin_url} ; sleep 10"
 juju ssh ${machine} "sudo service jenkins restart ; sleep 60"
@@ -67,4 +82,9 @@ juju ssh ${machine} "sudo service zuul restart"
 
 juju ssh ${machine} "bash ./install_master.sh"
 
+#
+# pick up manually (for now)
+#
+
+echo "Now, proceed with Step 3 under here: https://github.com/rasselin/os-ext-testing#setting-up-nodepool-jenkins-slaves"