From 1c26a81334e0a92e5d1bd212029762fab9d3155c Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Thu, 16 Aug 2018 09:39:01 +0200 Subject: Add Nova migration params to upstream env file JIRA: APEX-635 Change-Id: I488dd5d9b114aba5f4bb4591a0cdd8c19b692ce9 Signed-off-by: Ricardo Noriega --- apex/overcloud/deploy.py | 4 ++++ build/upstream-environment.yaml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index e310fa21..5fdc6914 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -718,6 +718,10 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir): "services") logging.info("opnfv-environment file written to {}".format(tmp_opnfv_env)) + with open(tmp_opnfv_env, 'r') as fh: + logging.debug("opnfv-environment content is : {}".format( + pprint.pformat(yaml.safe_load(fh.read())) + )) def generate_ceph_key(): diff --git a/build/upstream-environment.yaml b/build/upstream-environment.yaml index 2d037c38..ab110177 100644 --- a/build/upstream-environment.yaml +++ b/build/upstream-environment.yaml @@ -11,6 +11,9 @@ parameter_defaults: #NeutronBridgeMappings: "datacentre:br-ex" #OpenDaylightProviderMappings: "datacentre:br-ex" NeutronNetworkType: vxlan + MigrationSshKey: + public_key: replace_public_key + private_key: replace_private_key SshServerOptions: HostKey: - '/etc/ssh/ssh_host_rsa_key' -- cgit 1.2.3-korg