openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Default environment/services/* to docker" into stable/queens

This commit is contained in:
Zuul 2018-07-05 16:48:26 +00:00 committed by Gerrit Code Review
parent 7c518a40d9 930eff9fac
commit e899fcffdb
3 changed files with 21 additions and 21 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': [{

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

@ -61,14 +61,14 @@ class TestUndercloudInstall(TestPluginV1):
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-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/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
@ -123,14 +123,14 @@ class TestUndercloudUpgrade(TestPluginV1):
'major-upgrade-composable-steps-docker.yaml',
'--heat-native', '-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/'
'docker.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'

18
tripleoclient/v1/undercloud_config.py
View File

@ -43,10 +43,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']
class Paths(object):
@ -514,23 +514,23 @@ 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)
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_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:
@ -539,7 +539,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'):
try: