Merge "Simplify ceilometer service template conditions"
This commit is contained in:
commit
4e7e35b4e8
|
@ -54,11 +54,7 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
|
||||||
conditions:
|
|
||||||
ceilometer_enable_gnocchi: {equals: [{get_param: CeilometerEnableGnocchi}, True]}
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../containers-common.yaml
|
||||||
|
|
||||||
|
@ -131,16 +127,14 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {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/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
|
||||||
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
||||||
environment:
|
environment:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
step_5:
|
step_5:
|
||||||
map_merge:
|
if:
|
||||||
- if:
|
- {get_param: CeilometerEnableGnocchi}
|
||||||
- ceilometer_enable_gnocchi
|
|
||||||
- ceilometer_gnocchi_upgrade:
|
- ceilometer_gnocchi_upgrade:
|
||||||
start_order: 99
|
start_order: 99
|
||||||
image: *ceilometer_agent_central_image
|
image: *ceilometer_agent_central_image
|
||||||
|
@ -151,14 +145,12 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
-
|
- - /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
||||||
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
|
||||||
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
||||||
command:
|
command:
|
||||||
- '/usr/bin/bootstrap_host_exec'
|
- '/usr/bin/bootstrap_host_exec'
|
||||||
- 'ceilometer_agent_central'
|
- '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'"
|
- "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:
|
host_prep_tasks:
|
||||||
- name: create persistent directories
|
- name: create persistent directories
|
||||||
file:
|
file:
|
||||||
|
|
|
@ -48,7 +48,6 @@ parameters:
|
||||||
hidden: true
|
hidden: true
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../containers-common.yaml
|
||||||
|
|
||||||
|
@ -102,8 +101,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {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
|
- /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
|
||||||
- /run/libvirt:/run/libvirt:ro
|
- /run/libvirt:/run/libvirt:ro
|
||||||
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
||||||
|
|
|
@ -47,7 +47,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../containers-common.yaml
|
||||||
|
|
||||||
|
@ -120,8 +119,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {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
|
- /var/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
|
||||||
environment:
|
environment:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
|
|
|
@ -107,8 +107,8 @@ resources:
|
||||||
conditions:
|
conditions:
|
||||||
ceilometer_qdr_publish:
|
ceilometer_qdr_publish:
|
||||||
or:
|
or:
|
||||||
- {equals: [{get_param: CeilometerQdrPublishEvents}, true]}
|
- {get_param: CeilometerQdrPublishEvents}
|
||||||
- {equals: [{get_param: CeilometerQdrPublishMetrics}, true]}
|
- {get_param: CeilometerQdrPublishMetrics}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
|
@ -142,7 +142,6 @@ outputs:
|
||||||
params:
|
params:
|
||||||
ROLENAME: {get_param: RoleName}
|
ROLENAME: {get_param: RoleName}
|
||||||
tripleo::profile::base::ceilometer::agent::notification::notifier_host_port: {get_param: MetricsQdrPort}
|
tripleo::profile::base::ceilometer::agent::notification::notifier_host_port: {get_param: MetricsQdrPort}
|
||||||
- {}
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
map_merge:
|
map_merge:
|
||||||
- get_attr: [CeilometerServiceBase, role_data, service_config_settings]
|
- get_attr: [CeilometerServiceBase, role_data, service_config_settings]
|
||||||
|
@ -186,8 +185,7 @@ outputs:
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {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/lib/config-data/puppet-generated/ceilometer:/var/lib/kolla/config_files/src:ro
|
||||||
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
- /var/log/containers/ceilometer:/var/log/ceilometer:z
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -94,9 +94,6 @@ parameter_groups:
|
||||||
parameters:
|
parameters:
|
||||||
- GnocchiArchivePolicy
|
- GnocchiArchivePolicy
|
||||||
|
|
||||||
conditions:
|
|
||||||
ceilometer_qdr_publish: {equals: [{get_param: CeilometerQdrPublish}, true]}
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the Ceilometer role.
|
description: Role data for the Ceilometer role.
|
||||||
|
@ -128,7 +125,6 @@ outputs:
|
||||||
- {get_param: MemcachedTLS}
|
- {get_param: MemcachedTLS}
|
||||||
- ceilometer::cache_backend: 'dogpile.cache.pymemcache'
|
- ceilometer::cache_backend: 'dogpile.cache.pymemcache'
|
||||||
ceilometer::cache_tls_enabled: true
|
ceilometer::cache_tls_enabled: true
|
||||||
- {}
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
keystone:
|
keystone:
|
||||||
# Enable default notification queue
|
# Enable default notification queue
|
||||||
|
|
Loading…
Reference in New Issue