From 3ed29643b99ff99b7b4f4e1c96cd269d7c07f822 Mon Sep 17 00:00:00 2001 From: ramishra Date: Tue, 6 Apr 2021 09:04:00 +0530 Subject: [PATCH] Simplify ceilometer service template conditions Also removes leftover ceilometer_qdr_publish condition. Change-Id: I520d32488f3300ebe895040c2cd5f0acc0c0d386 --- ...ometer-agent-central-container-puppet.yaml | 46 ++++++++----------- ...ometer-agent-compute-container-puppet.yaml | 4 +- ...eilometer-agent-ipmi-container-puppet.yaml | 4 +- ...r-agent-notification-container-puppet.yaml | 8 ++-- .../ceilometer-base-container-puppet.yaml | 4 -- 5 files changed, 24 insertions(+), 42 deletions(-) diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index ea3a24bcff..8f85fe24a9 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -54,11 +54,7 @@ parameters: type: string hidden: true -conditions: - ceilometer_enable_gnocchi: {equals: [{get_param: CeilometerEnableGnocchi}, True]} - resources: - ContainersCommon: type: ../containers-common.yaml @@ -131,34 +127,30 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/ceilometer_agent_central.json:/var/lib/kolla/config_files/config.json:ro + - - /var/lib/kolla/config_files/ceilometer_agent_central.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro - /var/log/containers/ceilometer:/var/log/ceilometer:z environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS step_5: - map_merge: - - if: - - ceilometer_enable_gnocchi - - ceilometer_gnocchi_upgrade: - start_order: 99 - image: *ceilometer_agent_central_image - net: host - detach: false - privileged: false - user: root - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro - - /var/log/containers/ceilometer:/var/log/ceilometer:z - command: - - '/usr/bin/bootstrap_host_exec' - - 'ceilometer_agent_central' - - "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade && exit 0 || sleep 30; done; exit 1'" - - {} + if: + - {get_param: CeilometerEnableGnocchi} + - ceilometer_gnocchi_upgrade: + start_order: 99 + image: *ceilometer_agent_central_image + net: host + detach: false + privileged: false + user: root + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - - /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro + - /var/log/containers/ceilometer:/var/log/ceilometer:z + command: + - '/usr/bin/bootstrap_host_exec' + - 'ceilometer_agent_central' + - "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade && exit 0 || sleep 30; done; exit 1'" host_prep_tasks: - name: create persistent directories file: diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index 5756fa1843..49969f6d62 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml @@ -48,7 +48,6 @@ parameters: hidden: true resources: - ContainersCommon: type: ../containers-common.yaml @@ -102,8 +101,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro + - - /var/lib/kolla/config_files/ceilometer_agent_compute.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro - /run/libvirt:/run/libvirt:ro - /var/log/containers/ceilometer:/var/log/ceilometer:z diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index d89f82edd6..5c893bcd92 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml @@ -47,7 +47,6 @@ parameters: type: string resources: - ContainersCommon: type: ../containers-common.yaml @@ -120,8 +119,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:/var/lib/kolla/config_files/config.json:ro + - - /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index b967d684a5..4e45768c44 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -107,8 +107,8 @@ resources: conditions: ceilometer_qdr_publish: or: - - {equals: [{get_param: CeilometerQdrPublishEvents}, true]} - - {equals: [{get_param: CeilometerQdrPublishMetrics}, true]} + - {get_param: CeilometerQdrPublishEvents} + - {get_param: CeilometerQdrPublishMetrics} outputs: role_data: @@ -142,7 +142,6 @@ outputs: params: ROLENAME: {get_param: RoleName} tripleo::profile::base::ceilometer::agent::notification::notifier_host_port: {get_param: MetricsQdrPort} - - {} service_config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, service_config_settings] @@ -186,8 +185,7 @@ outputs: volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/ceilometer_agent_notification.json:/var/lib/kolla/config_files/config.json:ro + - - /var/lib/kolla/config_files/ceilometer_agent_notification.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro - /var/log/containers/ceilometer:/var/log/ceilometer:z environment: diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml index b503e347f3..33877b6405 100644 --- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml @@ -94,9 +94,6 @@ parameter_groups: parameters: - GnocchiArchivePolicy -conditions: - ceilometer_qdr_publish: {equals: [{get_param: CeilometerQdrPublish}, true]} - outputs: role_data: description: Role data for the Ceilometer role. @@ -128,7 +125,6 @@ outputs: - {get_param: MemcachedTLS} - ceilometer::cache_backend: 'dogpile.cache.pymemcache' ceilometer::cache_tls_enabled: true - - {} service_config_settings: keystone: # Enable default notification queue