diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-08-20 13:12:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-20 13:12:05 +0000 |
| commit | 911753bbeccd3b39b016c9b8ff4241a067e06e29 (patch) | |
| tree | 4234af0a8887973cf8f6c62e54cc92dbadbd667f | |
| parent | 5ce42bedb325439ae1e907cc0076a2e6d1266787 (diff) | |
| parent | 1c26a81334e0a92e5d1bd212029762fab9d3155c (diff) | |
Merge "Add Nova migration params to upstream env file"
| -rw-r--r-- | apex/overcloud/deploy.py | 4 | ||||
| -rw-r--r-- | build/upstream-environment.yaml | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 3dd2af34..a719dff1 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' |