From 449a77a42afd6e6a2c83cd1797b206b2a4f8823c Mon Sep 17 00:00:00 2001 From: Ryan McCabe Date: Thu, 30 Jan 2020 12:41:44 -0500 Subject: [PATCH] Revert "Remove panko" Panko removal had to be reverted as CF integration work was not completed on time for train compatibility. This reverts commit 2241528f4fd154e1f64bdeb0748c07c810ee8314. Depends-On: Id7a1989d0a41d1563e3656dd6363ea1101a67139 Change-Id: Ide7aff1d41ae8df35035db944b8e8c28aa645a5c Signed-off-by: Ryan McCabe --- .../remove-panko-deprecated-in-train-0444baa3ba4688f1.yaml | 6 ------ tripleoclient/config/standalone.py | 2 +- tripleoclient/v1/undercloud_config.py | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 releasenotes/notes/remove-panko-deprecated-in-train-0444baa3ba4688f1.yaml diff --git a/releasenotes/notes/remove-panko-deprecated-in-train-0444baa3ba4688f1.yaml b/releasenotes/notes/remove-panko-deprecated-in-train-0444baa3ba4688f1.yaml deleted file mode 100644 index 2e485152a..000000000 --- a/releasenotes/notes/remove-panko-deprecated-in-train-0444baa3ba4688f1.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -deprecations: - - | - Panko which is part of the telemetry services has been deprecated in - Train. From now on, it is not deployed anymore in the Undercloud if the - telemetry has been enabled during the installation. diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py index 378c7a5cd..5585267a0 100644 --- a/tripleoclient/config/standalone.py +++ b/tripleoclient/config/standalone.py @@ -89,7 +89,7 @@ class StandaloneConfig(BaseConfig): cfg.BoolOpt('enable_telemetry', default=telemetry, help=_('Whether to install Telemetry services ' - '(ceilometer, gnocchi, aodh) in the ' + '(ceilometer, gnocchi, aodh, panko ) in the ' 'Undercloud.') ), cfg.BoolOpt('enable_validations', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 0170a6d26..1ac5479f0 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -89,6 +89,7 @@ USER_HOME = os.environ.get('HOME', '') TELEMETRY_DOCKER_ENV_YAML = [ 'environments/services/undercloud-gnocchi.yaml', 'environments/services/undercloud-aodh.yaml', + 'environments/services/undercloud-panko.yaml', 'environments/services/undercloud-ceilometer.yaml'] CONF = cfg.CONF