openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use RpcPort for container healthchecks"

Browse Source
This commit is contained in:
Zuul 2019-05-10 09:31:16 +00:00 committed by Gerrit Code Review
commit eeb609a89d
13 changed files with 26 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/aodh/aodh-listener-container-puppet.yaml
View File

@ -97,15 +97,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [AodhBase, role_data, config_settings, 'aodh::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

10
deployment/aodh/aodh-notifier-container-puppet.yaml
View File

@ -97,15 +97,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [AodhBase, role_data, config_settings, 'aodh::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

10
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -199,15 +199,7 @@ outputs:
net: host
privileged: true
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [CinderBase, role_data, config_settings, 'cinder::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes: {get_attr: [CinderCommon, cinder_backup_volumes]}
environment: {get_attr: [CinderCommon, cinder_backup_environment]}
host_prep_tasks:

10
deployment/cinder/cinder-scheduler-container-puppet.yaml
View File

@ -120,15 +120,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [CinderBase, role_data, config_settings, 'cinder::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

10
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -323,15 +323,7 @@ outputs:
net: host
privileged: true
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [CinderBase, role_data, config_settings, 'cinder::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
environment: {get_attr: [CinderCommon, cinder_volume_environment]}
host_prep_tasks: {get_attr: [CinderCommon, cinder_volume_host_prep_tasks]}

14
deployment/containers-common.yaml
View File

@ -42,6 +42,10 @@ parameters:
type: string
description: Specifies the default CA cert to use if TLS is used for
services in the internal network.
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
conditions:
@ -128,3 +132,13 @@ outputs:
# container_puppet_apply.sh will copy this to /etc/puppet in the container
- /etc/puppet:/tmp/puppet-etc:ro
- /usr/share/openstack-puppet/modules:/usr/share/openstack-puppet/modules:ro
healthcheck_rpc_port:
description: healthcheck command that probes the RpcPort
value:
test:
str_replace:
template:
'/openstack/healthcheck RPCPORT'
params:
RPCPORT: {get_param: RpcPort}

21
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -122,23 +122,12 @@ resources:
HeatEngineLogging:
type: OS::TripleO::Services::Logging::HeatEngine
RabbitMQService:
type: OS::TripleO::Services::OsloMessagingRpc
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
outputs:
role_data:
description: Role data for the Heat Engine role.
value:
service_name: heat_engine
monitoring_subscription: {get_param: MonitoringSubscriptionHeatEngine}
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- get_attr: [HeatBase, role_data, config_settings]
@ -261,15 +250,7 @@ outputs:
privileged: false
stop_grace_period: 60
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [RabbitMQService, role_data, global_config_settings, 'oslo_messaging_rpc_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

10
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -508,15 +508,7 @@ outputs:
net: host
privileged: true
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [IronicBase, role_data, config_settings, 'ironic::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

10
deployment/neutron/neutron-metadata-container-puppet.yaml
View File

@ -184,15 +184,7 @@ outputs:
pid: host
privileged: true
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [NeutronBase, role_data, config_settings, 'neutron::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

21
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -284,16 +284,6 @@ resources:
MySQLClient:
type: ../../deployment/database/mysql-client.yaml
RabbitMQService:
type: OS::TripleO::Services::OsloMessagingRpc
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
NovaComputeCommon:
type: ./nova-compute-common-container-puppet.yaml
properties:
@ -391,7 +381,6 @@ outputs:
value:
service_name: nova_compute
monitoring_subscription: {get_param: MonitoringSubscriptionNovaCompute}
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- get_attr: [NovaLogging, config_settings]
@ -586,15 +575,7 @@ outputs:
privileged: true
user: nova
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [RabbitMQService, role_data, global_config_settings, 'oslo_messaging_rpc_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

21
deployment/nova/nova-ironic-container-puppet.yaml
View File

@ -49,16 +49,6 @@ resources:
MySQLClient:
type: ../../deployment/database/mysql-client.yaml
RabbitMQService:
type: OS::TripleO::Services::OsloMessagingRpc
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
NovaComputeCommon:
type: ./nova-compute-common-container-puppet.yaml
properties:
@ -84,7 +74,6 @@ outputs:
description: Role data for the Nova Compute service.
value:
service_name: nova_ironic
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- get_attr: [NovaBase, role_data, config_settings]
@ -146,15 +135,7 @@ outputs:
privileged: true
user: root
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [RabbitMQService, role_data, global_config_settings, 'oslo_messaging_rpc_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

21
deployment/nova/nova-scheduler-container-puppet.yaml
View File

@ -87,16 +87,6 @@ resources:
MySQLClient:
type: ../../deployment/database/mysql-client.yaml
RabbitMQService:
type: OS::TripleO::Services::OsloMessagingRpc
properties:
ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
NovaLogging:
type: OS::TripleO::Services::Logging::NovaCommon
properties:
@ -120,7 +110,6 @@ outputs:
value:
service_name: nova_scheduler
monitoring_subscription: {get_param: MonitoringSubscriptionNovaScheduler}
global_config_settings: {get_attr: [RabbitMQService, role_data, global_config_settings]}
config_settings:
map_merge:
- {get_attr: [NovaBase, role_data, config_settings]}
@ -173,15 +162,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [RabbitMQService, role_data, global_config_settings, 'oslo_messaging_rpc_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

10
deployment/sahara/sahara-engine-container-puppet.yaml
View File

@ -111,15 +111,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_attr: [SaharaBase, role_data, config_settings, 'sahara::rabbit_port']}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}