From 7351b3cc204e9fed8543778bf9d36494b95b3af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Wed, 18 Jul 2018 16:22:09 +0200 Subject: [PATCH] Add reflection of RpcPort to health checks This patch passes RpcPort parameter value to container health check scripts, which are based on verifying if service is connected to RabbitMQ. Change-Id: If63f136b5173bb9a94572ea5062a188469c2c782 Closes-Bug: #1782369 --- docker/services/aodh-listener.yaml | 9 ++++++++- docker/services/aodh-notifier.yaml | 9 ++++++++- docker/services/barbican-api.yaml | 18 ++++++++++++++++-- .../ceilometer-agent-notification.yaml | 9 ++++++++- docker/services/cinder-backup.yaml | 9 ++++++++- docker/services/cinder-scheduler.yaml | 9 ++++++++- docker/services/cinder-volume.yaml | 9 ++++++++- docker/services/heat-engine.yaml | 9 ++++++++- docker/services/ironic-conductor.yaml | 9 ++++++++- docker/services/manila-scheduler.yaml | 9 ++++++++- docker/services/mistral-engine.yaml | 9 ++++++++- docker/services/mistral-event-engine.yaml | 9 ++++++++- docker/services/mistral-executor.yaml | 9 ++++++++- docker/services/neutron-dhcp.yaml | 9 ++++++++- docker/services/neutron-l3.yaml | 9 ++++++++- docker/services/neutron-metadata.yaml | 9 ++++++++- docker/services/neutron-ovs-agent.yaml | 9 ++++++++- docker/services/nova-compute.yaml | 9 ++++++++- docker/services/nova-conductor.yaml | 9 ++++++++- docker/services/nova-consoleauth.yaml | 9 ++++++++- docker/services/nova-ironic.yaml | 9 ++++++++- docker/services/nova-scheduler.yaml | 9 ++++++++- docker/services/octavia-worker.yaml | 9 ++++++++- docker/services/sahara-engine.yaml | 9 ++++++++- 24 files changed, 200 insertions(+), 25 deletions(-) diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index 42c11d21c7..62ec06b5f8 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.yaml @@ -100,7 +100,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [AodhListenerBase, role_data, config_settings, 'aodh::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index 02cbfd7036..e0ab74d61f 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.yaml @@ -100,7 +100,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [AodhNotifierBase, role_data, config_settings, 'aodh::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index a30481f33c..b93913aa29 100644 --- a/docker/services/barbican-api.yaml +++ b/docker/services/barbican-api.yaml @@ -203,7 +203,14 @@ outputs: restart: always user: barbican healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [BarbicanApiBase, role_data, config_settings, 'barbican::api::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} @@ -220,7 +227,14 @@ outputs: restart: always user: barbican healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [BarbicanApiBase, role_data, config_settings, 'barbican::api::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index 3586b8f843..837582326b 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -116,7 +116,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [CeilometerAgentNotificationBase, role_data, config_settings, 'ceilometer::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index b3dfd34738..d9c24b8552 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -153,7 +153,14 @@ outputs: privileged: true restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [CinderBase, role_data, config_settings, 'cinder::rabbit_port']} volumes: {get_attr: [CinderCommon, cinder_backup_volumes]} environment: {get_attr: [CinderCommon, cinder_backup_environment]} host_prep_tasks: diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index 4ef4bac1ab..a4a2ef3742 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -118,7 +118,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [CinderBase, role_data, config_settings, 'cinder::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 9f7c0e8650..1f4b8420b7 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -169,7 +169,14 @@ outputs: privileged: true restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [CinderBase, role_data, config_settings, 'cinder::rabbit_port']} volumes: {get_attr: [CinderCommon, cinder_volume_volumes]} environment: {get_attr: [CinderCommon, cinder_volume_environment]} host_prep_tasks: diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index fe562a0468..52c691aeb1 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -142,7 +142,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [HeatBase, role_data, config_settings, 'heat::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 0cc1026d60..fcf26e2971 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -171,7 +171,14 @@ outputs: privileged: true restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [IronicConductorBase, role_data, config_settings, 'ironic::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml index b9063192d9..7ae490fe73 100644 --- a/docker/services/manila-scheduler.yaml +++ b/docker/services/manila-scheduler.yaml @@ -91,7 +91,14 @@ outputs: net: host restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [ManilaSchedulerPuppetBase, role_data, config_settings, 'manila::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index cfc1b2c420..e4e2476351 100644 --- a/docker/services/mistral-engine.yaml +++ b/docker/services/mistral-engine.yaml @@ -101,7 +101,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [MistralBase, role_data, config_settings, 'mistral::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/mistral-event-engine.yaml b/docker/services/mistral-event-engine.yaml index bc85479570..8ad23c8004 100644 --- a/docker/services/mistral-event-engine.yaml +++ b/docker/services/mistral-event-engine.yaml @@ -101,7 +101,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [MistralBase, role_data, config_settings, 'mistral::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index 3d01bc5ad3..4766b0ba66 100644 --- a/docker/services/mistral-executor.yaml +++ b/docker/services/mistral-executor.yaml @@ -114,7 +114,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [MistralBase, role_data, config_settings, 'mistral::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index 9713546f3c..8d834a7a1a 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -185,7 +185,14 @@ outputs: privileged: true restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NeutronBase, role_data, config_settings, 'neutron::rabbit_port']} ulimit: {get_param: DockerNeutronDHCPAgentUlimit} volumes: list_concat: diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index f6d5b09ac8..5a181f2ca6 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -184,7 +184,14 @@ outputs: privileged: true restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NeutronL3Base, role_data, config_settings, 'neutron::rabbit_port']} ulimit: {get_param: DockerNeutronL3AgentUlimit} volumes: list_concat: diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml index 2dfee1147d..1e68aaabbc 100644 --- a/docker/services/neutron-metadata.yaml +++ b/docker/services/neutron-metadata.yaml @@ -116,7 +116,14 @@ outputs: privileged: true restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NeutronMetadataBase, role_data, config_settings, 'neutron::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 3a965faee0..7532e7d33a 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -164,7 +164,14 @@ outputs: privileged: true restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NeutronOvsAgentBase, role_data, config_settings, 'neutron::rabbit_port']} ulimit: {get_param: DockerOpenvswitchUlimit} volumes: list_concat: diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index 117907929d..bdcfe4de33 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -208,7 +208,14 @@ outputs: user: nova restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NovaComputeBase, role_data, config_settings, 'nova::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index b669438609..e098c142c1 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -128,7 +128,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NovaConductorBase, role_data, config_settings, 'nova::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index 3d41fdf392..6ef5bb0e1c 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/docker/services/nova-consoleauth.yaml @@ -123,7 +123,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NovaConsoleauthPuppetBase, role_data, config_settings, 'nova::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index e893cf16d2..07b5787bea 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -123,7 +123,14 @@ outputs: user: root restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NovaIronicBase, role_data, config_settings, 'nova::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index c9aa6bf1bd..ef06c32172 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -123,7 +123,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [NovaSchedulerBase, role_data, config_settings, 'nova::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml index c567982698..0f07ff8781 100644 --- a/docker/services/octavia-worker.yaml +++ b/docker/services/octavia-worker.yaml @@ -117,7 +117,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [OctaviaWorkerPuppetBase, role_data, config_settings, 'octavia::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml index bfd1ea0e88..b395c8a6f7 100644 --- a/docker/services/sahara-engine.yaml +++ b/docker/services/sahara-engine.yaml @@ -114,7 +114,14 @@ outputs: privileged: false restart: always healthcheck: - test: /openstack/healthcheck + test: + list_join: + - ' ' + - - '/openstack/healthcheck' + - yaql: + expression: str($.data.port) + data: + port: {get_attr: [SaharaEnginePuppetBase, role_data, config_settings, 'sahara::rabbit_port']} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]}