Merge "Containerize Ceilometer Agent Ipmi"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
d95394a01c
|
|
@ -0,0 +1,113 @@
|
|||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Ceilometer Agent Ipmi service
|
||||
|
||||
parameters:
|
||||
DockerNamespace:
|
||||
description: namespace
|
||||
default: 'tripleoupstream'
|
||||
type: string
|
||||
DockerCeilometerIpmiImage:
|
||||
description: image
|
||||
default: 'centos-binary-ceilometer-ipmi: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
|
||||
|
||||
CeilometerAgentIpmiBase:
|
||||
type: ../../puppet/services/ceilometer-agent-ipmi.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 Ipmi role.
|
||||
value:
|
||||
service_name: {get_attr: [CeilometerAgentIpmiBase, role_data, service_name]}
|
||||
config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, config_settings]}
|
||||
step_config: &step_config
|
||||
get_attr: [CeilometerAgentIpmiBase, role_data, step_config]
|
||||
service_config_settings: {get_attr: [CeilometerAgentIpmiBase, 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_ipmi_image
|
||||
list_join:
|
||||
- '/'
|
||||
- [ {get_param: DockerNamespace}, {get_param: DockerCeilometerIpmiImage} ]
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ceilometer-agent-ipmi.json:
|
||||
command: /usr/bin/ceilometer-polling --polling-namespaces ipmi
|
||||
docker_config:
|
||||
step_3:
|
||||
ceilometer_init_log:
|
||||
start_order: 0
|
||||
image: *ceilometer_agent_ipmi_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_ipmi:
|
||||
image: *ceilometer_agent_ipmi_image
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
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/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_ipmi_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/bootstrap_host_exec ceilometer su ceilometer -s /bin/bash -c '/usr/bin/ceilometer-upgrade --skip-metering-database'"
|
||||
upgrade_tasks:
|
||||
- name: Stop and disable ceilometer agent ipmi service
|
||||
tags: step2
|
||||
service: name=openstack-ceilometer-agent-ipmi state=stopped enabled=no
|
||||
|
|
@ -45,6 +45,7 @@ resource_registry:
|
|||
OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml
|
||||
OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml
|
||||
OS::TripleO::Services::CeilometerAgentCentral: ../docker/services/ceilometer-agent-central.yaml
|
||||
OS::TripleO::Services::CeilometerAgentIpmi: ../docker/services/ceilometer-agent-ipmi.yaml
|
||||
OS::TripleO::Services::CeilometerAgentCompute: ../docker/services/ceilometer-agent-compute.yaml
|
||||
OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml
|
||||
OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml
|
||||
OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
|
||||
OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml
|
||||
|
|
|
|||
|
|
@ -200,6 +200,7 @@ resource_registry:
|
|||
# Undercloud Telemetry services
|
||||
OS::TripleO::Services::UndercloudCeilometerAgentCentral: OS::Heat::None
|
||||
OS::TripleO::Services::UndercloudCeilometerAgentNotification: OS::Heat::None
|
||||
OS::TripleO::Services::UndercloudCeilometerAgentIpmi: OS::Heat::None
|
||||
|
||||
#Gnocchi services
|
||||
OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
- OS::TripleO::Services::UndercloudAodhListener
|
||||
- OS::TripleO::Services::UndercloudAodhNotifier
|
||||
- OS::TripleO::Services::UndercloudCeilometerAgentCentral
|
||||
- OS::TripleO::Services::UndercloudCeilometerAgentIpmi
|
||||
- OS::TripleO::Services::UndercloudCeilometerAgentNotification
|
||||
- OS::TripleO::Services::UndercloudGnocchiApi
|
||||
- OS::TripleO::Services::UndercloudGnocchiMetricd
|
||||
|
|
|
|||
Loading…
Reference in New Issue