openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Consolidate RpcPort healthchecks"

Browse Source
This commit is contained in:
Zuul 2019-05-31 14:58:21 +00:00 committed by Gerrit Code Review
commit 2f43d4b967
13 changed files with 14 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -136,24 +136,6 @@ parameters:
type: string
default: 'messagingv2'
description: Driver or drivers to handle sending notifications.
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
RpcUserName:
default: guest
description: The username for messaging backend
type: string
RpcPassword:
description: The password for messaging backend
type: string
hidden: true
RpcUseSSL:
default: false
description: >
Messaging client subscriber parameter to specify
an SSL connection to the messaging host.
type: string
DeployIdentifier:
default: ''
type: string
@ -161,19 +143,6 @@ parameters:
Setting this to a unique value will re-run any deployment tasks which
perform configuration on a Heat stack-update.
parameter_groups:
- label: deprecated
description: |
The following parameters are deprecated and will be removed. They should not
be relied on for new deployments. If you have concerns regarding deprecated
parameters, please contact the TripleO development team on IRC or the
OpenStack mailing list.
parameters:
- RpcPort
- RpcUserName
- RpcPassword
- RpcUseSSL
conditions:
service_debug_unset: {equals : [{get_param: BarbicanDebug}, '']}
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@ -717,15 +686,7 @@ outputs:
privileged: false
restart: always
user: barbican
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@ -741,15 +702,7 @@ outputs:
privileged: false
restart: always
user: barbican
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
View File

@ -49,10 +49,6 @@ parameters:
description: The password for the redis service account.
type: string
hidden: true
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -105,15 +101,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -48,10 +48,6 @@ parameters:
MonitoringSubscriptionCeilometerNotification:
default: 'overcloud-ceilometer-agent-notification'
type: string
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -129,15 +125,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml
View File

@ -44,10 +44,6 @@ parameters:
MonitoringSubscriptionNovaConsoleauth:
default: 'overcloud-nova-consoleauth'
type: string
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -124,15 +120,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/manila/manila-scheduler-container-puppet.yaml
View File

@ -39,10 +39,6 @@ parameters:
MonitoringSubscriptionManilaScheduler:
default: 'overcloud-manila-scheduler'
type: string
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -96,15 +92,7 @@ outputs:
image: {get_param: DockerManilaSchedulerImage}
net: host
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/mistral/mistral-engine-container-puppet.yaml
View File

@ -57,10 +57,6 @@ parameters:
constraints:
- range: { min: 1 }
type: number
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -121,15 +117,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/mistral/mistral-event-engine-container-puppet.yaml
View File

@ -36,10 +36,6 @@ parameters:
default: {}
description: Parameters specific to the role
type: json
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -96,15 +92,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/mistral/mistral-executor-container-puppet.yaml
View File

@ -62,10 +62,6 @@ parameters:
default: false
description: Add the mistral user to the docker group to allow actions to perform docker operations.
type: boolean
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
TripleoAdminUser:
default: 'tripleo-admin'
description: Name of user which manages the hosts
@ -149,15 +145,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

14
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -68,10 +68,6 @@ parameters:
default: {}
description: Parameters specific to the role
type: json
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
EnableInternalTLS:
type: boolean
default: false
@ -300,15 +296,7 @@ outputs:
security_opt: 'label=disable'
depends_on:
- openvswitch
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
ulimit: {get_param: DockerNeutronDHCPAgentUlimit}
volumes:
list_concat:

14
deployment/neutron/neutron-l3-container-puppet.yaml
View File

@ -80,10 +80,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
NeutronL3AgentMode:
description: |
Agent mode for L3 agent. Must be one of legacy or dvr_snat.
@ -268,15 +264,7 @@ outputs:
restart: always
depends_on:
- openvswitch
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
ulimit: {get_param: DockerNeutronL3AgentUlimit}
volumes:
list_concat:

14
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -118,10 +118,6 @@ parameters:
Set or un-set the tunnel header checksum on outgoing IP packet
carrying GRE/VXLAN tunnel.
type: boolean
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
conditions:
no_firewall_driver: {equals : [{get_param: NeutronOVSFirewallDriver}, '']}
@ -304,15 +300,7 @@ outputs:
restart: always
depends_on:
- openvswitch
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
ulimit: {get_param: DockerOpenvswitchUlimit}
volumes:
list_concat:

14
deployment/neutron/neutron-sriov-agent-container-puppet.yaml
View File

@ -79,10 +79,6 @@ parameters:
type: comma_delimited_list
tags:
- role_specific
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -165,15 +161,7 @@ outputs:
pid: host
privileged: true
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
ulimit: {get_param: DockerSRIOVUlimit}
volumes:
list_concat:

14
deployment/octavia/octavia-worker-container-puppet.yaml
View File

@ -48,10 +48,6 @@ parameters:
MonitoringSubscriptionOctaviaWorker:
default: 'overcloud-octavia-worker'
type: string
RpcPort:
default: 5672
description: The network port for messaging backend
type: number
resources:
@ -129,15 +125,7 @@ outputs:
net: host
privileged: false
restart: always
healthcheck:
test:
list_join:
- ' '
- - '/openstack/healthcheck'
- yaql:
expression: str($.data.port)
data:
port: {get_param: RpcPort}
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}