diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-07-26 19:22:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-26 19:22:55 +0000 |
| commit | fdece1a118282d19cce0eb9e586cc0c07b0bd01a (patch) | |
| tree | 03b3334af01ecfffbc2ca0e09159d845c719d159 | |
| parent | fda3923dd7649fafed5ce050adb9d78a0e00bac4 (diff) | |
| parent | ffab5943f9f4c0ddf87004352791f2e852b9bdc4 (diff) | |
Merge "Add nova ssh key for vm resize"
| -rw-r--r-- | build/opnfv-environment.yaml | 6 | ||||
| -rw-r--r-- | ci/PR_revision.log | 1 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 7a723f54..4f9fd986 100644 --- 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 de684ef5..95d64aaf 100644 --- 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 e3fdc65f..1fcaa0df 100755 --- 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 |