flatten qdrouterd service configs
This change combines the previous puppet and docker files into a single file that performs the docker service installation and configuration. Change-Id: I7b1688a12964d939ece33a7f06d2493bf13c08eb
This commit is contained in:
parent
1c46d1850a
commit
479d7f5872
|
@ -6,8 +6,8 @@ resource_registry:
|
||||||
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
|
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
|
||||||
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
|
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
|
||||||
OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
|
OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
|
||||||
OS::TripleO::Services::Collectd: ../../docker/services/metrics/collectd.yaml
|
OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
|
||||||
OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
|
OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
|
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
|
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
|
||||||
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
||||||
|
|
|
@ -19,7 +19,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::HeatApiCfn: ../../deployment/heat/heat-api-cfn-container-puppet.yaml
|
OS::TripleO::Services::HeatApiCfn: ../../deployment/heat/heat-api-cfn-container-puppet.yaml
|
||||||
OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
|
OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
|
||||||
OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml
|
OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml
|
||||||
OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
|
OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
|
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
|
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
|
||||||
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
||||||
|
|
|
@ -7,7 +7,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml
|
OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml
|
||||||
OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml
|
OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml
|
||||||
OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml
|
OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
|
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
|
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
||||||
|
|
|
@ -12,7 +12,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml
|
OS::TripleO::Services::MistralEngine: ../../deployment/mistral/mistral-engine-container-puppet.yaml
|
||||||
OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml
|
OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml
|
||||||
OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml
|
OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
|
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
|
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
|
||||||
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
||||||
|
|
|
@ -36,43 +36,70 @@ parameters:
|
||||||
default: {}
|
default: {}
|
||||||
description: Parameters specific to the role
|
description: Parameters specific to the role
|
||||||
type: json
|
type: json
|
||||||
|
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
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../../docker/services/containers-common.yaml
|
||||||
|
|
||||||
QdrouterdBase:
|
|
||||||
type: ../../../puppet/services/messaging/rpc-qdrouterd.yaml
|
|
||||||
properties:
|
|
||||||
EndpointMap: {get_param: EndpointMap}
|
|
||||||
ServiceData: {get_param: ServiceData}
|
|
||||||
ServiceNetMap: {get_param: ServiceNetMap}
|
|
||||||
DefaultPasswords: {get_param: DefaultPasswords}
|
|
||||||
RoleName: {get_param: RoleName}
|
|
||||||
RoleParameters: {get_param: RoleParameters}
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the qdrouterd service.
|
description: Role data for the qdrouterd service.
|
||||||
value:
|
value:
|
||||||
service_name: {get_attr: [QdrouterdBase, role_data, service_name]}
|
service_name: oslo_messaging_rpc
|
||||||
global_config_settings: {get_attr: [QdrouterdBase, role_data, global_config_settings]}
|
global_config_settings:
|
||||||
|
oslo_messaging_rpc_scheme: amqp
|
||||||
|
oslo_messaging_rpc_user_name: {get_param: RpcUserName}
|
||||||
|
oslo_messaging_rpc_password: {get_param: RpcPassword}
|
||||||
|
oslo_messaging_rpc_use_ssl: {get_param: RpcUseSSL}
|
||||||
|
oslo_messaging_rpc_port: {get_param: RpcPort}
|
||||||
|
messaging_notify_service_name: 'amqp'
|
||||||
|
messaging_rpc_service_name: 'amqp'
|
||||||
|
keystone::messaging::amqp::amqp_pre_settled: 'notify'
|
||||||
config_settings:
|
config_settings:
|
||||||
map_merge:
|
tripleo::oslo_messaging_rpc::firewall_rules:
|
||||||
- {get_attr: [QdrouterdBase, role_data, config_settings]}
|
'109 qdrouterd':
|
||||||
- tripleo::oslo_messaging_rpc::firewall_rules:
|
dport:
|
||||||
'109 qdrouterd':
|
- {get_param: RpcPort}
|
||||||
dport:
|
- 31459
|
||||||
- 5672
|
- 31460
|
||||||
- 31459
|
qdr::listener_addr:
|
||||||
- 31460
|
str_replace:
|
||||||
service_config_settings: {get_attr: [QdrouterdBase, role_data, service_config_settings]}
|
template:
|
||||||
|
"%{hiera('$NETWORK')}"
|
||||||
|
params:
|
||||||
|
$NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
|
||||||
|
tripleo::profile::base::qdr::qdr_listener_port: {get_param: RpcPort}
|
||||||
|
tripleo::profile::base::qdr::qdr_username: {get_param: RpcUserName}
|
||||||
|
tripleo::profile::base::qdr::qdr_password: {get_param: RpcPassword}
|
||||||
|
tripleo::rabbitmq::firewall_rules:
|
||||||
|
'109 qdr':
|
||||||
|
dport:
|
||||||
|
- {get_param: RpcPort}
|
||||||
|
service_config_settings: {}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: qdrouterd
|
config_volume: qdrouterd
|
||||||
step_config:
|
step_config: |
|
||||||
get_attr: [QdrouterdBase, role_data, step_config]
|
include ::tripleo::profile::base::qdr
|
||||||
config_image: {get_param: DockerQdrouterdConfigImage}
|
config_image: {get_param: DockerQdrouterdConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/qdrouterd.json:
|
/var/lib/kolla/config_files/qdrouterd.json:
|
||||||
|
@ -124,8 +151,7 @@ outputs:
|
||||||
with_items:
|
with_items:
|
||||||
- { 'path': /var/log/containers/qdrouterd, 'setype': svirt_sandbox_file_t }
|
- { 'path': /var/log/containers/qdrouterd, 'setype': svirt_sandbox_file_t }
|
||||||
- { 'path': /var/lib/qdrouterd, 'setype': svirt_sandbox_file_t }
|
- { 'path': /var/lib/qdrouterd, 'setype': svirt_sandbox_file_t }
|
||||||
metadata_settings:
|
metadata_settings: {}
|
||||||
get_attr: [QdrouterdBase, role_data, metadata_settings]
|
|
||||||
post_upgrade_tasks:
|
post_upgrade_tasks:
|
||||||
- when: step|int == 1
|
- when: step|int == 1
|
||||||
import_role:
|
import_role:
|
|
@ -116,7 +116,7 @@ parameters:
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ../containers-common.yaml
|
type: ../../docker/services/containers-common.yaml
|
||||||
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
|
@ -36,35 +36,60 @@ parameters:
|
||||||
default: {}
|
default: {}
|
||||||
description: Parameters specific to the role
|
description: Parameters specific to the role
|
||||||
type: json
|
type: json
|
||||||
|
RabbitUserName:
|
||||||
|
default: guest
|
||||||
|
description: The username for RabbitMQ
|
||||||
|
type: string
|
||||||
|
RabbitPassword:
|
||||||
|
description: The password for RabbitMQ
|
||||||
|
type: string
|
||||||
|
hidden: true
|
||||||
|
RabbitClientPort:
|
||||||
|
description: Set rabbit subscriber port, change this if using SSL
|
||||||
|
default: 5672
|
||||||
|
type: number
|
||||||
|
MonitoringSubscriptionQdr:
|
||||||
|
default: 'overcloud-qdr'
|
||||||
|
type: string
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ./containers-common.yaml
|
type: ../../docker/services/containers-common.yaml
|
||||||
|
|
||||||
QdrouterdBase:
|
|
||||||
type: ../../puppet/services/qdr.yaml
|
|
||||||
properties:
|
|
||||||
EndpointMap: {get_param: EndpointMap}
|
|
||||||
ServiceData: {get_param: ServiceData}
|
|
||||||
ServiceNetMap: {get_param: ServiceNetMap}
|
|
||||||
DefaultPasswords: {get_param: DefaultPasswords}
|
|
||||||
RoleName: {get_param: RoleName}
|
|
||||||
RoleParameters: {get_param: RoleParameters}
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the qdrouterd service.
|
description: Role data for the qdrouterd service.
|
||||||
value:
|
value:
|
||||||
service_name: {get_attr: [QdrouterdBase, role_data, service_name]}
|
service_name: rabbitmq
|
||||||
global_config_settings: {get_attr: [QdrouterdBase, role_data, global_config_settings]}
|
monitoring_subscription: {get_param: MonitoringSubscriptionQdr}
|
||||||
config_settings: {get_attr: [QdrouterdBase, role_data, config_settings]}
|
global_config_settings:
|
||||||
service_config_settings: {get_attr: [QdrouterdBase, role_data, service_config_settings]}
|
messaging_notify_service_name: 'amqp'
|
||||||
|
messaging_rpc_service_name: 'amqp'
|
||||||
|
keystone::messaging::amqp::amqp_pre_settled: 'notify'
|
||||||
|
config_settings:
|
||||||
|
tripleo::rabbitmq::firewall_rules:
|
||||||
|
'109 qdr':
|
||||||
|
dport:
|
||||||
|
- {get_param: RabbitClientPort}
|
||||||
|
qdr::listener_addr:
|
||||||
|
str_replace:
|
||||||
|
template:
|
||||||
|
"%{hiera('$NETWORK')}"
|
||||||
|
params:
|
||||||
|
$NETWORK: {get_param: [ServiceNetMap, QdrNetwork]}
|
||||||
|
# cannot pass qdr::listener_port directly because it needs to be a string
|
||||||
|
# we do the conversion in the puppet layer
|
||||||
|
tripleo::profile::base::qdr::qdr_listener_port: {get_param: RabbitClientPort}
|
||||||
|
tripleo::profile::base::qdr::qdr_username: {get_param: RabbitUserName}
|
||||||
|
tripleo::profile::base::qdr::qdr_password: {get_param: RabbitPassword}
|
||||||
|
|
||||||
|
service_config_settings: {}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: qdrouterd
|
config_volume: qdrouterd
|
||||||
step_config:
|
step_config: |
|
||||||
get_attr: [QdrouterdBase, role_data, step_config]
|
include ::tripleo::profile::base::qdr
|
||||||
config_image: {get_param: DockerQdrouterdConfigImage}
|
config_image: {get_param: DockerQdrouterdConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/qdrouterd.json:
|
/var/lib/kolla/config_files/qdrouterd.json:
|
||||||
|
@ -124,8 +149,7 @@ outputs:
|
||||||
Log files from qrouterd containers can be found under
|
Log files from qrouterd containers can be found under
|
||||||
/var/log/containers/qrouterd.
|
/var/log/containers/qrouterd.
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
metadata_settings:
|
metadata_settings: {}
|
||||||
get_attr: [QdrouterdBase, role_data, metadata_settings]
|
|
||||||
post_upgrade_tasks:
|
post_upgrade_tasks:
|
||||||
- when: step|int == 1
|
- when: step|int == 1
|
||||||
import_role:
|
import_role:
|
|
@ -19,4 +19,4 @@ parameter_defaults:
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
|
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
|
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::MetricsQdr: ../docker/services/metrics/qdr.yaml
|
OS::TripleO::Services::Collectd: ../deployment/metrics/collectd-container-puppet.yaml
|
||||||
OS::TripleO::Services::Collectd: ../docker/services/metrics/collectd.yaml
|
OS::TripleO::Services::MetricsQdr: ../deployment/metrics/qdr-container-puppet.yaml
|
||||||
|
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::Qdr: ../../docker/services/qdrouterd.yaml
|
OS::TripleO::Services::Qdr: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml
|
||||||
|
|
|
@ -1,101 +0,0 @@
|
||||||
heat_template_version: rocky
|
|
||||||
|
|
||||||
description: >
|
|
||||||
Qpid dispatch router service for messaging RPCs configured with Puppet
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
ServiceData:
|
|
||||||
default: {}
|
|
||||||
description: Dictionary packing service data
|
|
||||||
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
|
|
||||||
EndpointMap:
|
|
||||||
default: {}
|
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
|
||||||
via parameter_defaults in the resource registry.
|
|
||||||
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
|
|
||||||
EndpointMap:
|
|
||||||
default: {}
|
|
||||||
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
|
|
||||||
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
|
|
||||||
|
|
||||||
resources:
|
|
||||||
QdrouterdServiceBase:
|
|
||||||
type: ../qdr.yaml
|
|
||||||
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 OsloMessagingRpc role.
|
|
||||||
value:
|
|
||||||
service_name: oslo_messaging_rpc
|
|
||||||
monitoring_subscription: {get_attr: [QdrouterdServiceBase, role_data, monitoring_subscription]}
|
|
||||||
global_config_settings:
|
|
||||||
map_merge:
|
|
||||||
- get_attr: [QdrouterdServiceBase, role_data, global_config_settings]
|
|
||||||
- oslo_messaging_rpc_scheme: amqp
|
|
||||||
oslo_messaging_rpc_user_name: {get_param: RpcUserName}
|
|
||||||
oslo_messaging_rpc_password: {get_param: RpcPassword}
|
|
||||||
oslo_messaging_rpc_use_ssl: {get_param: RpcUseSSL}
|
|
||||||
oslo_messaging_rpc_port: {get_param: RpcPort}
|
|
||||||
config_settings:
|
|
||||||
map_merge:
|
|
||||||
- get_attr: [QdrouterdServiceBase, role_data, config_settings]
|
|
||||||
- tripleo::oslo_messaging_rpc::firewall_rules:
|
|
||||||
'109 qdrouterd':
|
|
||||||
dport:
|
|
||||||
- {get_param: RpcPort}
|
|
||||||
- 31459
|
|
||||||
- 31460
|
|
||||||
qdr::listener_addr:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
"%{hiera('$NETWORK')}"
|
|
||||||
params:
|
|
||||||
$NETWORK: {get_param: [ServiceNetMap, OsloMessagingRpcNetwork]}
|
|
||||||
tripleo::profile::base::qdr::qdr_listener_port: {get_param: RpcPort}
|
|
||||||
tripleo::profile::base::qdr::qdr_username: {get_param: RpcUserName}
|
|
||||||
tripleo::profile::base::qdr::qdr_password: {get_param: RpcPassword}
|
|
||||||
step_config: |
|
|
||||||
include ::tripleo::profile::base::qdr
|
|
|
@ -1,77 +0,0 @@
|
||||||
heat_template_version: rocky
|
|
||||||
|
|
||||||
description: >
|
|
||||||
Qpid dispatch router service configured with Puppet
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
ServiceData:
|
|
||||||
default: {}
|
|
||||||
description: Dictionary packing service data
|
|
||||||
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
|
|
||||||
EndpointMap:
|
|
||||||
default: {}
|
|
||||||
description: Mapping of service endpoint -> protocol. Typically set
|
|
||||||
via parameter_defaults in the resource registry.
|
|
||||||
type: json
|
|
||||||
RabbitUserName:
|
|
||||||
default: guest
|
|
||||||
description: The username for RabbitMQ
|
|
||||||
type: string
|
|
||||||
RabbitPassword:
|
|
||||||
description: The password for RabbitMQ
|
|
||||||
type: string
|
|
||||||
hidden: true
|
|
||||||
RabbitClientPort:
|
|
||||||
description: Set rabbit subscriber port, change this if using SSL
|
|
||||||
default: 5672
|
|
||||||
type: number
|
|
||||||
MonitoringSubscriptionQdr:
|
|
||||||
default: 'overcloud-qdr'
|
|
||||||
type: string
|
|
||||||
|
|
||||||
outputs:
|
|
||||||
role_data:
|
|
||||||
description: Role data for the Qdr role.
|
|
||||||
value:
|
|
||||||
service_name: rabbitmq
|
|
||||||
monitoring_subscription: {get_param: MonitoringSubscriptionQdr}
|
|
||||||
global_config_settings:
|
|
||||||
messaging_notify_service_name: 'amqp'
|
|
||||||
messaging_rpc_service_name: 'amqp'
|
|
||||||
keystone::messaging::amqp::amqp_pre_settled: 'notify'
|
|
||||||
config_settings:
|
|
||||||
tripleo::rabbitmq::firewall_rules:
|
|
||||||
'109 qdr':
|
|
||||||
dport:
|
|
||||||
- {get_param: RabbitClientPort}
|
|
||||||
qdr::listener_addr:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
"%{hiera('$NETWORK')}"
|
|
||||||
params:
|
|
||||||
$NETWORK: {get_param: [ServiceNetMap, QdrNetwork]}
|
|
||||||
# cannot pass qdr::listener_port directly because it needs to be a string
|
|
||||||
# we do the conversion in the puppet layer
|
|
||||||
tripleo::profile::base::qdr::qdr_listener_port: {get_param: RabbitClientPort}
|
|
||||||
tripleo::profile::base::qdr::qdr_username: {get_param: RabbitUserName}
|
|
||||||
tripleo::profile::base::qdr::qdr_password: {get_param: RabbitPassword}
|
|
||||||
|
|
||||||
step_config: |
|
|
||||||
include ::tripleo::profile::base::qdr
|
|
|
@ -18,7 +18,7 @@ environments:
|
||||||
name: messaging/rpc-qdrouterd-notify-rabbitmq-hybrid
|
name: messaging/rpc-qdrouterd-notify-rabbitmq-hybrid
|
||||||
title: Hybrid qdrouterd for rpc and rabbitmq for notify messaging backend
|
title: Hybrid qdrouterd for rpc and rabbitmq for notify messaging backend
|
||||||
files:
|
files:
|
||||||
puppet/services/messaging/rpc-qdrouterd.yaml:
|
deployment/messaging/rpc-qdrouterd-container-puppet.yaml:
|
||||||
parameters:
|
parameters:
|
||||||
- RpcPort
|
- RpcPort
|
||||||
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml:
|
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml:
|
||||||
|
@ -28,7 +28,7 @@ environments:
|
||||||
RpcPort: 31459
|
RpcPort: 31459
|
||||||
NotifyPort: 5672
|
NotifyPort: 5672
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/messaging/rpc-qdrouterd.yaml
|
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml
|
||||||
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
|
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
|
||||||
description: |
|
description: |
|
||||||
Include this environment to enable hybrid messaging backends for
|
Include this environment to enable hybrid messaging backends for
|
||||||
|
|
|
@ -229,7 +229,7 @@ VALIDATE_PUPPET_OVERRIDE = {
|
||||||
'./deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml': False,
|
'./deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml': False,
|
||||||
'./deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml': False,
|
'./deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml': False,
|
||||||
# docker/services/messaging/*.yaml provide oslo_messaging services
|
# docker/services/messaging/*.yaml provide oslo_messaging services
|
||||||
'./docker/services/messaging/rpc-qdrouterd.yaml': False,
|
'./deployment/messaging/rpc-qdrouterd-container-puppet.yaml': False,
|
||||||
# docker/services/pacemaker/*-rabbitmq.yaml provide oslo_messaging services
|
# docker/services/pacemaker/*-rabbitmq.yaml provide oslo_messaging services
|
||||||
'./deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml': False,
|
'./deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml': False,
|
||||||
'./deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml': False,
|
'./deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml': False,
|
||||||
|
|
Loading…
Reference in New Issue