openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add reflection of RpcPort to health checks"

This commit is contained in:
Zuul 2018-09-04 14:19:43 +00:00 committed by Gerrit Code Review
parent 44a877fc2e 7351b3cc20
commit 224383fa35
24 changed files with 200 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/services/aodh-listener.yaml
View File

@ -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]}

9
docker/services/aodh-notifier.yaml
View File

@ -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]}

18
docker/services/barbican-api.yaml
View File

@ -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]}

9
docker/services/ceilometer-agent-notification.yaml
View File

@ -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]}

9
docker/services/cinder-backup.yaml
View File

@ -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:

9
docker/services/cinder-scheduler.yaml
View File

@ -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]}

9
docker/services/cinder-volume.yaml
View File

@ -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:

9
docker/services/heat-engine.yaml
View File

@ -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]}

9
docker/services/ironic-conductor.yaml
View File

@ -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]}

9
docker/services/manila-scheduler.yaml
View File

@ -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]}

9
docker/services/mistral-engine.yaml
View File

@ -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]}

9
docker/services/mistral-event-engine.yaml
View File

@ -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]}

9
docker/services/mistral-executor.yaml
View File

@ -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]}

9
docker/services/neutron-dhcp.yaml
View File

@ -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:

9
docker/services/neutron-l3.yaml
View File

@ -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:

9
docker/services/neutron-metadata.yaml
View File

@ -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]}

9
docker/services/neutron-ovs-agent.yaml
View File

@ -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:

9
docker/services/nova-compute.yaml
View File

@ -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]}

9
docker/services/nova-conductor.yaml
View File

@ -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]}

9
docker/services/nova-consoleauth.yaml
View File

@ -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]}

9
docker/services/nova-ironic.yaml
View File

@ -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]}

9
docker/services/nova-scheduler.yaml
View File

@ -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]}

9
docker/services/octavia-worker.yaml
View File

@ -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]}

9
docker/services/sahara-engine.yaml
View File

@ -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]}