Merge "Add Nova migration params to upstream env file"

diff --combined apex/overcloud/deploy.py
index 3dd2af3,5fdc691..a719dff
--- 1/apex/overcloud/deploy.py
--- 2/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@@ -718,6 -718,10 +718,10 @@@ def prep_env(ds, ns, inv, opnfv_env, ne
                           "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():
@@@ -871,7 -875,8 +875,7 @@@ def external_network_cmds(ns, ds)
                   "--allocation-pool start={},end={} --subnet-range " \
                   "{}".format(gateway, pool_start, pool_end, str(cidr))
      if external and cidr.version == 6:
 -        subnet_cmd += ' --ip-version 6 --ipv6-ra-mode slaac ' \
 -                      '--ipv6-address-mode slaac'
 +        subnet_cmd += ' --ip-version 6'
      cmds.append(subnet_cmd)
      logging.debug("Neutron external network commands determined "
                    "as: {}".format(cmds))