openstack
/
python-tripleoclient
Code Issues Proposed changes

Default environment/services/* to docker 

This updates the relevant environment/services-docker code
to default to dockerish environment/services.

Depends-On: I923731f46ea26582160a11d2dfe85792ab74110b

Change-Id: Ie95b935964fdbf9e75ca04c93df9f824ec9fef51
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2018-03-27 11:08:43 +02:00 committed by Emilien Macchi
parent 12e280a326
commit 3ebe9c2d9f
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/tests/v1/overcloud_image/test_container_image.py
View File

@ -376,7 +376,7 @@ class TestContainerImagePrepare(TestPluginV1):
mock_cip, mock_cipd):
arglist = [
'-e',
'environments/services-docker/neutron-opendaylight.yaml',
'environments/services/neutron-opendaylight.yaml',
]
ges.return_value = (
@ -387,7 +387,7 @@ class TestContainerImagePrepare(TestPluginV1):
'OS::TripleO::Services::OpenDaylightApi']))
pmef_call_args = [
'environments/services-docker/neutron-opendaylight.yaml']
'environments/services/neutron-opendaylight.yaml']
expected_oc_yaml_contents = {
'container_images': [{
@ -427,7 +427,7 @@ class TestContainerImagePrepare(TestPluginV1):
mock_cip, mock_cipd):
arglist = [
'-e',
'environments/services-docker/neutron-ovn.yaml',
'environments/services/neutron-ovn.yaml',
]
ges.return_value = (
@ -437,7 +437,7 @@ class TestContainerImagePrepare(TestPluginV1):
'OS::TripleO::Services::OVNDBs']))
pmef_call_args = [
'environments/services-docker/neutron-ovn.yaml']
'environments/services/neutron-ovn.yaml']
expected_oc_yaml_contents = {
'container_images': [{

24
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@ -67,14 +67,14 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/ironic.yaml',
'services/ironic.yaml',
'-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/ironic-inspector.yaml', '-e',
'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/mistral.yaml', '-e',
'services/mistral.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/zaqar.yaml', '-e',
'services/zaqar.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/tripleo-ui.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
@ -86,9 +86,9 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/undercloud-haproxy.yaml', '-e',
'services/undercloud-haproxy.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/undercloud-keepalived.yaml', '-e',
'services/undercloud-keepalived.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
@ -146,14 +146,14 @@ class TestUndercloudUpgrade(TestPluginV1):
'major-upgrade-composable-steps-docker.yaml',
'--heat-native', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/ironic.yaml',
'services/ironic.yaml',
'-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/ironic-inspector.yaml', '-e',
'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/mistral.yaml', '-e',
'services/mistral.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/zaqar.yaml', '-e',
'services/zaqar.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/tripleo-ui.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
@ -165,9 +165,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'use-dns-for-vips.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/undercloud-haproxy.yaml', '-e',
'services/undercloud-haproxy.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services-docker/undercloud-keepalived.yaml', '-e',
'services/undercloud-keepalived.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'

28
tripleoclient/v1/undercloud_config.py
View File

@ -59,10 +59,10 @@ THT_HOME = os.environ.get('THT_HOME',
"/usr/share/openstack-tripleo-heat-templates/")
TELEMETRY_DOCKER_ENV_YAML = [
'environments/services-docker/undercloud-gnocchi.yaml',
'environments/services-docker/undercloud-aodh.yaml',
'environments/services-docker/undercloud-panko.yaml',
'environments/services-docker/undercloud-ceilometer.yaml']
'environments/services/undercloud-gnocchi.yaml',
'environments/services/undercloud-aodh.yaml',
'environments/services/undercloud-panko.yaml',
'environments/services/undercloud-ceilometer.yaml']
# Control plane network name
SUBNETS_DEFAULT = ['ctlplane-subnet']
@ -688,29 +688,29 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False):
if CONF.get('enable_ironic'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services-docker/ironic.yaml")]
tht_templates, "environments/services/ironic.yaml")]
# ironic-inspector can only work if ironic is enabled
if CONF.get('enable_ironic_inspector'):
deploy_args += ['-e', os.path.join(
tht_templates,
"environments/services-docker/ironic-inspector.yaml")]
"environments/services/ironic-inspector.yaml")]
_process_drivers_and_hardware_types(CONF, env_data)
_process_ipa_args(CONF, env_data)
if CONF.get('enable_mistral'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services-docker/mistral.yaml")]
tht_templates, "environments/services/mistral.yaml")]
if CONF.get('enable_novajoin'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services-docker/novajoin.yaml")]
tht_templates, "environments/services/novajoin.yaml")]
env_data['NovajoinIpaOtp'] = CONF['ipa_otp']
if CONF.get('enable_zaqar'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services-docker/zaqar.yaml")]
tht_templates, "environments/services/zaqar.yaml")]
if CONF.get('enable_telemetry'):
for env_file in TELEMETRY_DOCKER_ENV_YAML:
@ -723,7 +723,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False):
if CONF.get('enable_cinder'):
deploy_args += ['-e', os.path.join(
tht_templates,
"environments/services-docker/undercloud-cinder.yaml")]
"environments/services/undercloud-cinder.yaml")]
if CONF.get('generate_service_certificate'):
deploy_args += ['-e', os.path.join(
@ -738,9 +738,9 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False):
registry_overwrites.update(
_get_public_tls_resource_registry_overwrites(enable_tls_yaml_path))
deploy_args += [
'-e', os.path.join(tht_templates, 'environments/services-docker/'
'-e', os.path.join(tht_templates, 'environments/services/'
'undercloud-haproxy.yaml'),
'-e', os.path.join(tht_templates, 'environments/services-docker/'
'-e', os.path.join(tht_templates, 'environments/services/'
'undercloud-keepalived.yaml')]
if (CONF.get('generate_service_certificate') or
@ -767,10 +767,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False):
'environments/use-dns-for-vips.yaml'),
'-e', os.path.join(
tht_templates,
'environments/services-docker/undercloud-haproxy.yaml'),
'environments/services/undercloud-haproxy.yaml'),
'-e', os.path.join(
tht_templates,
'environments/services-docker/undercloud-keepalived.yaml')]
'environments/services/undercloud-keepalived.yaml')]
u = CONF.get('deployment_user') or utils.get_deployment_user()
env_data['DeploymentUser'] = u