Merge "Add nova ssh key for vm resize"

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 7a723f5..4f9fd98 100644 (file)
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -11,6 +11,12 @@ parameters:
   EnableTacker: true
   ExtraConfig:
     tripleo::ringbuilder::build_ring: False
+    nova::nova_public_key:
+      type: 'ssh-rsa'
+      replace_public_key:
+    nova::nova_private_key:
+      type: 'ssh-rsa'
+      replace_private_key:
     nova::policy::policies:
       nova-os_compute_api:servers:show:host_status:
         key: 'os_compute_api:servers:show:host_status'

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index de684ef..95d64aa 100644 (file)
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -16,3 +16,4 @@
 40,Move mongo to step 1
 42, congress typo
 44,Fixes nova host/ip bug
+43,Add support for live migration and resize

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index e3fdc65..1fcaa0d 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -203,6 +203,14 @@ if [ "${deploy_options_array['tacker']}" == 'False' ]; then
     sed -i '/EnableTacker:/c\  EnableTacker: false' opnfv-environment.yaml
 fi
 
+# Create a key for use by nova for live migration
+echo "Creating nova SSH key for nova resize support"
+ssh-keygen -f nova_id_rsa -b 1024 -P ""
+public_key=\'\$(cat nova_id_rsa.pub | cut -d ' ' -f 2)\'
+sed -i "s#replace_public_key:#key: \$public_key#g" opnfv-environment.yaml
+python -c 'open("opnfv-environment-new.yaml", "w").write((open("opnfv-environment.yaml").read().replace("replace_private_key:", "key: \"" + "".join(open("nova_id_rsa").readlines()).replace("\\n","\\\n") + "\"")))'
+mv -f opnfv-environment-new.yaml opnfv-environment.yaml
+
 source stackrc
 set -o errexit
 # Workaround for APEX-207 where sometimes swift proxy is down