Containerize Ceilometer Agents
Depends-on: I30ba93f76171e5993b5f0e1d7f1f5533acb25740 Closes-bug: #1668925 Change-Id: I3cb61d2d8765f9c2601bb00c4bfa24162883b96a
This commit is contained in:
parent
00551e744a
commit
2d85067b9f
|
@ -0,0 +1,113 @@
|
||||||
|
heat_template_version: pike
|
||||||
|
|
||||||
|
description: >
|
||||||
|
OpenStack containerized Ceilometer Agent Central service
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
DockerNamespace:
|
||||||
|
description: namespace
|
||||||
|
default: 'tripleoupstream'
|
||||||
|
type: string
|
||||||
|
DockerCeilometerCentralImage:
|
||||||
|
description: image
|
||||||
|
default: 'centos-binary-ceilometer-central:latest'
|
||||||
|
type: string
|
||||||
|
EndpointMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
|
via parameter_defaults in the resource registry.
|
||||||
|
type: json
|
||||||
|
ServiceNetMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service_name -> network name. Typically set
|
||||||
|
via parameter_defaults in the resource registry. This
|
||||||
|
mapping overrides those in ServiceNetMapDefaults.
|
||||||
|
type: json
|
||||||
|
DefaultPasswords:
|
||||||
|
default: {}
|
||||||
|
type: json
|
||||||
|
RoleName:
|
||||||
|
default: ''
|
||||||
|
description: Role name on which the service is applied
|
||||||
|
type: string
|
||||||
|
RoleParameters:
|
||||||
|
default: {}
|
||||||
|
description: Parameters specific to the role
|
||||||
|
type: json
|
||||||
|
|
||||||
|
resources:
|
||||||
|
|
||||||
|
ContainersCommon:
|
||||||
|
type: ./containers-common.yaml
|
||||||
|
|
||||||
|
CeilometerAgentCentralBase:
|
||||||
|
type: ../../puppet/services/ceilometer-agent-central.yaml
|
||||||
|
properties:
|
||||||
|
EndpointMap: {get_param: EndpointMap}
|
||||||
|
ServiceNetMap: {get_param: ServiceNetMap}
|
||||||
|
DefaultPasswords: {get_param: DefaultPasswords}
|
||||||
|
RoleName: {get_param: RoleName}
|
||||||
|
RoleParameters: {get_param: RoleParameters}
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
role_data:
|
||||||
|
description: Role data for the Ceilometer Agent Central role.
|
||||||
|
value:
|
||||||
|
service_name: {get_attr: [CeilometerAgentCentralBase, role_data, service_name]}
|
||||||
|
config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, config_settings]}
|
||||||
|
step_config: &step_config
|
||||||
|
get_attr: [CeilometerAgentCentralBase, role_data, step_config]
|
||||||
|
service_config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, service_config_settings]}
|
||||||
|
# BEGIN DOCKER SETTINGS
|
||||||
|
puppet_config:
|
||||||
|
config_volume: ceilometer
|
||||||
|
puppet_tags: ceilometer_config
|
||||||
|
step_config: *step_config
|
||||||
|
config_image: &ceilometer_agent_central_image
|
||||||
|
list_join:
|
||||||
|
- '/'
|
||||||
|
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerCentralImage} ]
|
||||||
|
kolla_config:
|
||||||
|
/var/lib/kolla/config_files/ceilometer-agent-central.json:
|
||||||
|
command: /usr/bin/ceilometer-polling --polling-namespaces central
|
||||||
|
docker_config:
|
||||||
|
step_3:
|
||||||
|
ceilometer_init_log:
|
||||||
|
start_order: 0
|
||||||
|
image: *ceilometer_agent_central_image
|
||||||
|
user: root
|
||||||
|
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
|
||||||
|
volumes:
|
||||||
|
- /var/log/containers/ceilometer:/var/log/ceilometer
|
||||||
|
step_4:
|
||||||
|
ceilometer_agent_central:
|
||||||
|
image: *ceilometer_agent_central_image
|
||||||
|
net: host
|
||||||
|
privileged: false
|
||||||
|
restart: always
|
||||||
|
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/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
||||||
|
environment:
|
||||||
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||||
|
step_5:
|
||||||
|
ceilometer_gnocchi_upgrade:
|
||||||
|
start_order: 1
|
||||||
|
image: *ceilometer_agent_central_image
|
||||||
|
net: host
|
||||||
|
detach: false
|
||||||
|
privileged: false
|
||||||
|
volumes:
|
||||||
|
list_concat:
|
||||||
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
-
|
||||||
|
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
||||||
|
- /var/log/containers/ceilometer:/var/log/ceilometer
|
||||||
|
command: ["/usr/bin/ceilometer-upgrade", "--skip-metering-database"]
|
||||||
|
upgrade_tasks:
|
||||||
|
- name: Stop and disable ceilometer agent central service
|
||||||
|
tags: step2
|
||||||
|
service: name=openstack-ceilometer-agent-central state=stopped enabled=no
|
|
@ -0,0 +1,91 @@
|
||||||
|
heat_template_version: pike
|
||||||
|
|
||||||
|
description: >
|
||||||
|
OpenStack containerized Ceilometer Agent Compute service
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
DockerNamespace:
|
||||||
|
description: namespace
|
||||||
|
default: 'tripleoupstream'
|
||||||
|
type: string
|
||||||
|
DockerCeilometerComputeImage:
|
||||||
|
description: image
|
||||||
|
default: 'centos-binary-ceilometer-compute:latest'
|
||||||
|
type: string
|
||||||
|
EndpointMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
|
via parameter_defaults in the resource registry.
|
||||||
|
type: json
|
||||||
|
ServiceNetMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service_name -> network name. Typically set
|
||||||
|
via parameter_defaults in the resource registry. This
|
||||||
|
mapping overrides those in ServiceNetMapDefaults.
|
||||||
|
type: json
|
||||||
|
DefaultPasswords:
|
||||||
|
default: {}
|
||||||
|
type: json
|
||||||
|
RoleName:
|
||||||
|
default: ''
|
||||||
|
description: Role name on which the service is applied
|
||||||
|
type: string
|
||||||
|
RoleParameters:
|
||||||
|
default: {}
|
||||||
|
description: Parameters specific to the role
|
||||||
|
type: json
|
||||||
|
|
||||||
|
resources:
|
||||||
|
|
||||||
|
ContainersCommon:
|
||||||
|
type: ./containers-common.yaml
|
||||||
|
|
||||||
|
CeilometerAgentComputeBase:
|
||||||
|
type: ../../puppet/services/ceilometer-agent-compute.yaml
|
||||||
|
properties:
|
||||||
|
EndpointMap: {get_param: EndpointMap}
|
||||||
|
ServiceNetMap: {get_param: ServiceNetMap}
|
||||||
|
DefaultPasswords: {get_param: DefaultPasswords}
|
||||||
|
RoleName: {get_param: RoleName}
|
||||||
|
RoleParameters: {get_param: RoleParameters}
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
role_data:
|
||||||
|
description: Role data for the Ceilometer Agent Compute role.
|
||||||
|
value:
|
||||||
|
service_name: {get_attr: [CeilometerAgentComputeBase, role_data, service_name]}
|
||||||
|
config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, config_settings]}
|
||||||
|
step_config: &step_config
|
||||||
|
get_attr: [CeilometerAgentComputeBase, role_data, step_config]
|
||||||
|
service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}
|
||||||
|
# BEGIN DOCKER SETTINGS
|
||||||
|
puppet_config:
|
||||||
|
config_volume: ceilometer
|
||||||
|
puppet_tags: ceilometer_config
|
||||||
|
step_config: *step_config
|
||||||
|
config_image: &ceilometer_agent_compute_image
|
||||||
|
list_join:
|
||||||
|
- '/'
|
||||||
|
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerComputeImage} ]
|
||||||
|
kolla_config:
|
||||||
|
/var/lib/kolla/config_files/ceilometer-agent-compute.json:
|
||||||
|
command: /usr/bin/ceilometer-polling --polling-namespaces compute
|
||||||
|
docker_config:
|
||||||
|
step_4:
|
||||||
|
ceilometer_agent-compute:
|
||||||
|
image: *ceilometer_agent_compute_image
|
||||||
|
net: host
|
||||||
|
privileged: false
|
||||||
|
restart: always
|
||||||
|
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/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
||||||
|
environment:
|
||||||
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||||
|
upgrade_tasks:
|
||||||
|
- name: Stop and disable ceilometer-agent-compute service
|
||||||
|
tags: step2
|
||||||
|
service: name=openstack-ceilometer-agent-compute state=stopped enabled=no
|
|
@ -0,0 +1,113 @@
|
||||||
|
heat_template_version: pike
|
||||||
|
|
||||||
|
description: >
|
||||||
|
OpenStack containerized Ceilometer Agent Notification service
|
||||||
|
|
||||||
|
parameters:
|
||||||
|
DockerNamespace:
|
||||||
|
description: namespace
|
||||||
|
default: 'tripleoupstream'
|
||||||
|
type: string
|
||||||
|
DockerCeilometerNotificationImage:
|
||||||
|
description: image
|
||||||
|
default: 'centos-binary-ceilometer-notification:latest'
|
||||||
|
type: string
|
||||||
|
EndpointMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
|
via parameter_defaults in the resource registry.
|
||||||
|
type: json
|
||||||
|
ServiceNetMap:
|
||||||
|
default: {}
|
||||||
|
description: Mapping of service_name -> network name. Typically set
|
||||||
|
via parameter_defaults in the resource registry. This
|
||||||
|
mapping overrides those in ServiceNetMapDefaults.
|
||||||
|
type: json
|
||||||
|
DefaultPasswords:
|
||||||
|
default: {}
|
||||||
|
type: json
|
||||||
|
RoleName:
|
||||||
|
default: ''
|
||||||
|
description: Role name on which the service is applied
|
||||||
|
type: string
|
||||||
|
RoleParameters:
|
||||||
|
default: {}
|
||||||
|
description: Parameters specific to the role
|
||||||
|
type: json
|
||||||
|
|
||||||
|
resources:
|
||||||
|
|
||||||
|
ContainersCommon:
|
||||||
|
type: ./containers-common.yaml
|
||||||
|
|
||||||
|
CeilometerAgentNotificationBase:
|
||||||
|
type: ../../puppet/services/ceilometer-agent-notification.yaml
|
||||||
|
properties:
|
||||||
|
EndpointMap: {get_param: EndpointMap}
|
||||||
|
ServiceNetMap: {get_param: ServiceNetMap}
|
||||||
|
DefaultPasswords: {get_param: DefaultPasswords}
|
||||||
|
RoleName: {get_param: RoleName}
|
||||||
|
RoleParameters: {get_param: RoleParameters}
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
role_data:
|
||||||
|
description: Role data for the Ceilometer Agent Notification role.
|
||||||
|
value:
|
||||||
|
service_name: {get_attr: [CeilometerAgentNotificationBase, role_data, service_name]}
|
||||||
|
config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, config_settings]}
|
||||||
|
step_config: &step_config
|
||||||
|
get_attr: [CeilometerAgentNotificationBase, role_data, step_config]
|
||||||
|
service_config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, service_config_settings]}
|
||||||
|
# BEGIN DOCKER SETTINGS
|
||||||
|
puppet_config:
|
||||||
|
config_volume: ceilometer
|
||||||
|
puppet_tags: ceilometer_config
|
||||||
|
step_config: *step_config
|
||||||
|
config_image: &ceilometer_agent_notification_image
|
||||||
|
list_join:
|
||||||
|
- '/'
|
||||||
|
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerNotificationImage} ]
|
||||||
|
kolla_config:
|
||||||
|
/var/lib/kolla/config_files/ceilometer-agent-notification.json:
|
||||||
|
command: /usr/bin/ceilometer-agent-notification
|
||||||
|
docker_config:
|
||||||
|
step_3:
|
||||||
|
ceilometer_init_log:
|
||||||
|
start_order: 0
|
||||||
|
image: *ceilometer_agent_notification_image
|
||||||
|
user: root
|
||||||
|
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
|
||||||
|
volumes:
|
||||||
|
- /var/log/containers/ceilometer:/var/log/ceilometer
|
||||||
|
step_4:
|
||||||
|
ceilometer_agent-notification:
|
||||||
|
image: *ceilometer_agent_notification_image
|
||||||
|
net: host
|
||||||
|
privileged: false
|
||||||
|
restart: always
|
||||||
|
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/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
||||||
|
environment:
|
||||||
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||||
|
step_5:
|
||||||
|
ceilometer_gnocchi_upgrade:
|
||||||
|
start_order: 1
|
||||||
|
image: *ceilometer_agent_notification_image
|
||||||
|
net: host
|
||||||
|
detach: false
|
||||||
|
privileged: false
|
||||||
|
volumes:
|
||||||
|
list_concat:
|
||||||
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
-
|
||||||
|
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
||||||
|
- /var/log/containers/ceilometer:/var/log/ceilometer
|
||||||
|
command: ["/usr/bin/ceilometer-upgrade", "--skip-metering-database"]
|
||||||
|
upgrade_tasks:
|
||||||
|
- name: Stop and disable ceilometer agent notification service
|
||||||
|
tags: step2
|
||||||
|
service: name=openstack-ceilometer-notification state=stopped enabled=no
|
|
@ -41,6 +41,9 @@ resource_registry:
|
||||||
OS::TripleO::Services::AodhNotifier: ../docker/services/aodh-notifier.yaml
|
OS::TripleO::Services::AodhNotifier: ../docker/services/aodh-notifier.yaml
|
||||||
OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml
|
OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml
|
||||||
OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
|
OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
|
||||||
|
OS::TripleO::Services::CeilometerAgentCentral: ../docker/services/ceilometer-agent-central.yaml
|
||||||
|
OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml
|
||||||
|
OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
|
||||||
|
|
||||||
OS::TripleO::PostDeploySteps: ../docker/post.yaml
|
OS::TripleO::PostDeploySteps: ../docker/post.yaml
|
||||||
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
|
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
|
||||||
|
@ -58,3 +61,4 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::NovaLibvirt
|
- OS::TripleO::Services::NovaLibvirt
|
||||||
- OS::TripleO::Services::ComputeNeutronOvsAgent
|
- OS::TripleO::Services::ComputeNeutronOvsAgent
|
||||||
- OS::TripleO::Services::Docker
|
- OS::TripleO::Services::Docker
|
||||||
|
- OS::TripleO::Services::CeilometerAgentCompute
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
resource_registry:
|
||||||
|
OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml
|
||||||
|
OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
|
|
@ -195,6 +195,10 @@ resource_registry:
|
||||||
OS::TripleO::Services::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml
|
OS::TripleO::Services::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml
|
||||||
OS::TripleO::Services::CeilometerAgentIpmi: puppet/services/ceilometer-agent-ipmi.yaml
|
OS::TripleO::Services::CeilometerAgentIpmi: puppet/services/ceilometer-agent-ipmi.yaml
|
||||||
OS::TripleO::Services::Horizon: puppet/services/horizon.yaml
|
OS::TripleO::Services::Horizon: puppet/services/horizon.yaml
|
||||||
|
# Undercloud Telemetry services
|
||||||
|
OS::TripleO::Services::UndercloudCeilometerAgentCentral: OS::Heat::None
|
||||||
|
OS::TripleO::Services::UndercloudCeilometerAgentNotification: OS::Heat::None
|
||||||
|
|
||||||
#Gnocchi services
|
#Gnocchi services
|
||||||
OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml
|
OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml
|
||||||
OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.yaml
|
OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.yaml
|
||||||
|
|
|
@ -45,3 +45,5 @@
|
||||||
- OS::TripleO::Services::UndercloudGnocchiMetricd
|
- OS::TripleO::Services::UndercloudGnocchiMetricd
|
||||||
- OS::TripleO::Services::UndercloudGnocchiStatsd
|
- OS::TripleO::Services::UndercloudGnocchiStatsd
|
||||||
- OS::TripleO::Services::UndercloudPankoApi
|
- OS::TripleO::Services::UndercloudPankoApi
|
||||||
|
- OS::TripleO::Services::UndercloudCeilometerAgentCentral
|
||||||
|
- OS::TripleO::Services::UndercloudCeilometerAgentNotification
|
||||||
|
|
Loading…
Reference in New Issue