diff options
author | Tim Rozet <trozet@redhat.com> | 2018-07-13 16:22:30 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2018-07-18 12:19:36 -0400 |
commit | a473a19aca3837eeb77adc41523bb1db95b5f47d (patch) | |
tree | 332bb1f9b9a8e9f05d411c1bf8f801194de95563 /apex/tests | |
parent | 6b9d8c01be763bbf46048caa08902880367672a7 (diff) |
Add param for ODL password into overcloudrc
Recent changes upstream have removed the default 'admin' ODL password
and now password is randomly generated:
https://review.openstack.org/#/c/578505/
So in OPNFV we now store the password in overcloudrc as
SDN_CONTROLLER_PASSWORD variable.
Also includes minor fixes to unittests.
Change-Id: Iabe7e4f902442c80af99ba1603a3927cf13d0393
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/tests')
-rw-r--r-- | apex/tests/test_apex_overcloud_deploy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py index 57d74bdd..b598e40e 100644 --- a/apex/tests/test_apex_overcloud_deploy.py +++ b/apex/tests/test_apex_overcloud_deploy.py @@ -160,7 +160,7 @@ class TestOvercloudDeploy(unittest.TestCase): assert_in('/usr/share/openstack-tripleo-heat-templates/environments/' 'storage-environment.yaml', result_cmd) assert_in('/usr/share/openstack-tripleo-heat-templates/environments' - '/services-docker/neutron-opendaylight.yaml', result_cmd) + '/services/neutron-opendaylight.yaml', result_cmd) ds['deploy_options']['os_version'] = 'master' result_cmd = create_deploy_cmd(ds, ns, inv, '/tmp', virt) assert_in('/usr/share/openstack-tripleo-heat-templates/environments' @@ -673,6 +673,6 @@ class TestOvercloudDeploy(unittest.TestCase): output = get_docker_sdn_file(ds_opts) self.assertEqual(output, ('/usr/share/openstack-tripleo-heat-templates' - '/environments/services-docker/neutron-opendaylight' + '/environments/services/neutron-opendaylight' '.yaml') ) |