openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Disable telemetry if it's not enabled"

Browse Source
This commit is contained in:
Zuul 2019-08-07 03:25:49 +00:00 committed by Gerrit Code Review
commit 44c76f8c38
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tripleoclient/tests/v1/undercloud/test_install_upgrade.py
View File

@ -95,6 +95,8 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -157,6 +159,8 @@ class TestUndercloudInstall(TestPluginV1):
'/usertht/environments/services/ironic-inspector.yaml', '-e', '/usertht/environments/services/ironic-inspector.yaml', '-e',
'/usertht/environments/services/mistral.yaml', '-e', '/usertht/environments/services/mistral.yaml', '-e',
'/usertht/environments/services/zaqar-swift-backend.yaml', '-e', '/usertht/environments/services/zaqar-swift-backend.yaml', '-e',
'/usertht/environments/'
'disable-telemetry.yaml', '-e',
'/usertht/environments/services/tempest.yaml', '-e', '/usertht/environments/services/tempest.yaml', '-e',
'/usertht/environments/public-tls-undercloud.yaml', '/usertht/environments/public-tls-undercloud.yaml',
'--public-virtual-ip', '192.168.24.2', '--public-virtual-ip', '192.168.24.2',
@ -320,6 +324,8 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -387,6 +393,8 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -450,6 +458,8 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -510,6 +520,8 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/barbican.yaml', '-e', 'services/barbican.yaml', '-e',
@ -594,6 +606,8 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -657,6 +671,8 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -719,6 +735,8 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -781,6 +799,8 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',
@ -847,6 +867,8 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/zaqar-swift-backend.yaml', '-e', 'services/zaqar-swift-backend.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e', 'services/tempest.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'public-tls-undercloud.yaml', 'public-tls-undercloud.yaml',

3
tripleoclient/v1/undercloud_config.py
View File

@ -559,6 +559,9 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
if CONF.get('enable_telemetry'): if CONF.get('enable_telemetry'):
for env_file in TELEMETRY_DOCKER_ENV_YAML: for env_file in TELEMETRY_DOCKER_ENV_YAML:
deploy_args += ['-e', os.path.join(tht_templates, env_file)] deploy_args += ['-e', os.path.join(tht_templates, env_file)]
else:
deploy_args += ['-e', os.path.join(
tht_templates, "environments/disable-telemetry.yaml")]
if CONF.get('enable_cinder'): if CONF.get('enable_cinder'):
deploy_args += ['-e', os.path.join( deploy_args += ['-e', os.path.join(