summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-22 19:52:50 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-22 19:52:50 +0000
commita835c1b436ee942636986f942e2bd4b5330777e3 (patch)
tree62268b6ae2bb7c110651c6b97af5187c158a867c
parentcf0df7681a4d274dc60eb1e2bc81909eb01b884f (diff)
parentbe0dc9170277dffd13403b49acc51c634a7fab94 (diff)
Merge "added the Qtip ssh keys through MAAS for node deployment." into stable/brahmaputra
-rwxr-xr-xci/02-maasdeploy.sh3
-rw-r--r--ci/maas/sshkeys/QtipKey.pub1
2 files changed, 4 insertions, 0 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 7c6a0481..a00fb002 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -133,6 +133,9 @@ maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/d
maas maas boot-resources import
maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
+#Added the Qtip public to run the Qtip test after install on bare metal nodes.
+maas maas sshkeys new key="`cat ./maas/sshkeys/QtipKey.pub`"
+
#adding compute and control nodes VM to MAAS for deployment purpose.
if [ "$virtinstall" -eq 1 ]; then
# create two more VMs to do the deployment.
diff --git a/ci/maas/sshkeys/QtipKey.pub b/ci/maas/sshkeys/QtipKey.pub
new file mode 100644
index 00000000..dc93faa0
--- /dev/null
+++ b/ci/maas/sshkeys/QtipKey.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFWkAL5DwtPJ+0BMKBUcgq8ORdjMcj/wJl4qVVYeUdQDT/oS6pKuHNuk7BJpCLYLfHgSzO+Hv8J+5UyqXXXJKGxfAUPtpXrHRgburwhRJwcgtQVqWbQXHnY2jsikHeWWW5RX6SHxrLrxX04a8xmtD7BbDiJ6HZqVSem8XC15eZvw1C1dbqmbZqWBRWLFzhHf/9goucaSP3ekYWVCUPPlDS+D7r2Mc2Ch0Z7AivEJZ5mTamefS80B1ZNBRObvP/W5jPoAh5H9bHrqayZyEVGaYOk/toddJJAQHJIXu/8YSxnUnC0FbTtZ5s2JO/3Big5/IpW5m5NsHCOqVPjHkKkgkT