Browse Source

Disable telemetry if it's not enabled

The disable-telemetry.yaml environment is used to disable all the
telemetry services and to disable the notification drivers. Since we
didn't have this by default, notifications were still being sent to
the undercloud rabbitmq and never consumed.

Conflicts:
	tripleoclient/tests/v1/undercloud/test_undercloud.py

Change-Id: I53eab2c41c80f5dafff9824bf3086e1d9a369e22
Closes-Bug: #1838828
(cherry picked from commit 0faa33a6b0)
tags/10.7.1
Alex Schultz 1 month ago
parent
commit
2e0b581f72

+ 22
- 0
tripleoclient/tests/v1/undercloud/test_undercloud.py View File

@@ -88,6 +88,8 @@ class TestUndercloudInstall(TestPluginV1):
88 88
              '/usr/share/openstack-tripleo-heat-templates/environments/'
89 89
              'services/zaqar-swift-backend.yaml', '-e',
90 90
              '/usr/share/openstack-tripleo-heat-templates/environments/'
91
+             'disable-telemetry.yaml', '-e',
92
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
91 93
              'services/tripleo-ui.yaml', '-e',
92 94
              '/usr/share/openstack-tripleo-heat-templates/environments/'
93 95
              'services/tempest.yaml', '-e',
@@ -161,6 +163,8 @@ class TestUndercloudInstall(TestPluginV1):
161 163
              '/usertht/environments/services/ironic-inspector.yaml', '-e',
162 164
              '/usertht/environments/services/mistral.yaml', '-e',
163 165
              '/usertht/environments/services/zaqar-swift-backend.yaml', '-e',
166
+             '/usertht/environments/'
167
+             'disable-telemetry.yaml', '-e',
164 168
              '/usertht/environments/services/tripleo-ui.yaml', '-e',
165 169
              '/usertht/environments/services/tempest.yaml', '-e',
166 170
              '/usertht/environments/public-tls-undercloud.yaml',
@@ -323,6 +327,8 @@ class TestUndercloudInstall(TestPluginV1):
323 327
              '/usr/share/openstack-tripleo-heat-templates/environments/'
324 328
              'services/zaqar-swift-backend.yaml', '-e',
325 329
              '/usr/share/openstack-tripleo-heat-templates/environments/'
330
+             'disable-telemetry.yaml', '-e',
331
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
326 332
              'services/tripleo-ui.yaml', '-e',
327 333
              '/usr/share/openstack-tripleo-heat-templates/environments/'
328 334
              'services/tempest.yaml', '-e',
@@ -391,6 +397,8 @@ class TestUndercloudInstall(TestPluginV1):
391 397
              '/usr/share/openstack-tripleo-heat-templates/environments/'
392 398
              'services/zaqar-swift-backend.yaml', '-e',
393 399
              '/usr/share/openstack-tripleo-heat-templates/environments/'
400
+             'disable-telemetry.yaml', '-e',
401
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
394 402
              'services/tripleo-ui.yaml', '-e',
395 403
              '/usr/share/openstack-tripleo-heat-templates/environments/'
396 404
              'services/tempest.yaml', '-e',
@@ -455,6 +463,8 @@ class TestUndercloudInstall(TestPluginV1):
455 463
              '/usr/share/openstack-tripleo-heat-templates/environments/'
456 464
              'services/zaqar-swift-backend.yaml', '-e',
457 465
              '/usr/share/openstack-tripleo-heat-templates/environments/'
466
+             'disable-telemetry.yaml', '-e',
467
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
458 468
              'services/tripleo-ui.yaml', '-e',
459 469
              '/usr/share/openstack-tripleo-heat-templates/environments/'
460 470
              'services/tempest.yaml', '-e',
@@ -516,6 +526,8 @@ class TestUndercloudInstall(TestPluginV1):
516 526
              '/usr/share/openstack-tripleo-heat-templates/environments/'
517 527
              'services/zaqar-swift-backend.yaml', '-e',
518 528
              '/usr/share/openstack-tripleo-heat-templates/environments/'
529
+             'disable-telemetry.yaml', '-e',
530
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
519 531
              'services/tripleo-ui.yaml', '-e',
520 532
              '/usr/share/openstack-tripleo-heat-templates/environments/'
521 533
              'services/tempest.yaml', '-e',
@@ -596,6 +608,8 @@ class TestUndercloudUpgrade(TestPluginV1):
596 608
              '/usr/share/openstack-tripleo-heat-templates/environments/'
597 609
              'services/zaqar-swift-backend.yaml', '-e',
598 610
              '/usr/share/openstack-tripleo-heat-templates/environments/'
611
+             'disable-telemetry.yaml', '-e',
612
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
599 613
              'services/tripleo-ui.yaml', '-e',
600 614
              '/usr/share/openstack-tripleo-heat-templates/environments/'
601 615
              'services/tempest.yaml', '-e',
@@ -683,6 +697,8 @@ class TestUndercloudUpgrade(TestPluginV1):
683 697
              '/usr/share/openstack-tripleo-heat-templates/environments/'
684 698
              'services/zaqar-swift-backend.yaml', '-e',
685 699
              '/usr/share/openstack-tripleo-heat-templates/environments/'
700
+             'disable-telemetry.yaml', '-e',
701
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
686 702
              'services/tripleo-ui.yaml', '-e',
687 703
              '/usr/share/openstack-tripleo-heat-templates/environments/'
688 704
              'services/tempest.yaml', '-e',
@@ -746,6 +762,8 @@ class TestUndercloudUpgrade(TestPluginV1):
746 762
              '/usr/share/openstack-tripleo-heat-templates/environments/'
747 763
              'services/zaqar-swift-backend.yaml', '-e',
748 764
              '/usr/share/openstack-tripleo-heat-templates/environments/'
765
+             'disable-telemetry.yaml', '-e',
766
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
749 767
              'services/tripleo-ui.yaml', '-e',
750 768
              '/usr/share/openstack-tripleo-heat-templates/environments/'
751 769
              'services/tempest.yaml', '-e',
@@ -809,6 +827,8 @@ class TestUndercloudUpgrade(TestPluginV1):
809 827
              '/usr/share/openstack-tripleo-heat-templates/environments/'
810 828
              'services/zaqar-swift-backend.yaml', '-e',
811 829
              '/usr/share/openstack-tripleo-heat-templates/environments/'
830
+             'disable-telemetry.yaml', '-e',
831
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
812 832
              'services/tripleo-ui.yaml', '-e',
813 833
              '/usr/share/openstack-tripleo-heat-templates/environments/'
814 834
              'services/tempest.yaml', '-e',
@@ -876,6 +896,8 @@ class TestUndercloudUpgrade(TestPluginV1):
876 896
              '/usr/share/openstack-tripleo-heat-templates/environments/'
877 897
              'services/zaqar-swift-backend.yaml', '-e',
878 898
              '/usr/share/openstack-tripleo-heat-templates/environments/'
899
+             'disable-telemetry.yaml', '-e',
900
+             '/usr/share/openstack-tripleo-heat-templates/environments/'
879 901
              'services/tripleo-ui.yaml', '-e',
880 902
              '/usr/share/openstack-tripleo-heat-templates/environments/'
881 903
              'services/tempest.yaml', '-e',

+ 3
- 0
tripleoclient/v1/undercloud_config.py View File

@@ -413,6 +413,9 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
413 413
     if CONF.get('enable_telemetry'):
414 414
         for env_file in TELEMETRY_DOCKER_ENV_YAML:
415 415
             deploy_args += ['-e', os.path.join(tht_templates, env_file)]
416
+    else:
417
+        deploy_args += ['-e', os.path.join(
418
+            tht_templates, "environments/disable-telemetry.yaml")]
416 419
 
417 420
     if CONF.get('enable_ui'):
418 421
         deploy_args += ['-e', os.path.join(

Loading…
Cancel
Save