Merge "Use enable-legacy-telemetry.yaml when enabling telemetry"

tripleoclient/tests/v1/undercloud/test_install_upgrade.py

@@ -94,8 +94,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -155,8 +153,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usertht/environments/services/ironic-inspector.yaml', '-e',
              '/usertht/environments/services/'
              'undercloud-remove-novajoin.yaml', '-e',
-             '/usertht/environments/'
-             'disable-telemetry.yaml', '-e',
              '/usertht/environments/public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -317,8 +313,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '4.3.2.1',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -381,8 +375,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -441,8 +433,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -498,8 +488,6 @@ class TestUndercloudInstall(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/barbican.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'barbican-backend-simple-crypto.yaml', '-e',
@@ -591,8 +579,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -679,8 +665,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -743,8 +727,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -806,8 +788,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -867,8 +847,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
@@ -934,8 +912,6 @@ class TestUndercloudUpgrade(TestPluginV1):
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'services/undercloud-remove-novajoin.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'disable-telemetry.yaml', '-e',
-             '/usr/share/openstack-tripleo-heat-templates/environments/'
              'public-tls-undercloud.yaml',
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',

tripleoclient/v1/undercloud_config.py

@@ -86,11 +86,6 @@ THT_HOME = os.environ.get('THT_HOME',
 
 USER_HOME = os.environ.get('HOME', '')
 
-TELEMETRY_DOCKER_ENV_YAML = [
-    'environments/services/undercloud-gnocchi.yaml',
-    'environments/services/undercloud-aodh.yaml',
-    'environments/services/undercloud-ceilometer.yaml']
-
 CONF = cfg.CONF
 
 # When adding new options to the lists below, make sure to regenerate the
@@ -663,11 +658,8 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
             tht_templates, "environments/undercloud-enable-swift.yaml")]
 
     if CONF.get('enable_telemetry'):
-        for env_file in TELEMETRY_DOCKER_ENV_YAML:
-            deploy_args += ['-e', os.path.join(tht_templates, env_file)]
-    else:
         deploy_args += ['-e', os.path.join(
-            tht_templates, "environments/disable-telemetry.yaml")]
+            tht_templates, "environments/enable-legacy-telemetry.yaml")]
 
     if CONF.get('enable_cinder'):
         deploy_args += ['-e', os.path.join(