aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-08-17 13:26:40 -0400
committerDan Prince <dprince@redhat.com>2016-08-23 21:29:05 -0400
commit92f2cfb162294c289b2ef246c739d2da5dc22a4b (patch)
treedd2b0da7ae7fb59a242e9271ff3a8773b3635503 /puppet/controller.yaml
parent58bf3932a86f2f5582937e3da8cb74dfd29c116b (diff)
Move RabbitMQ settings out of controller.yaml
This moves the config settings out of controller.yaml for RabbitMQ and into puppet/services/rabbitmq.yaml. Related-Bug: #1604414 Change-Id: I6b3d71653fb91b89b85dae7df4088afff22b71ac
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml31
1 files changed, 0 insertions, 31 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index b63a01c3..65e47b77 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -176,28 +176,6 @@ parameters:
Specifies the interface where the public-facing virtual ip will be assigned.
This should be int_public when a VLAN is being used.
type: string
- RabbitCookie:
- type: string
- default: '' # Has to be here because of the ignored empty value bug
- hidden: true
- RabbitPassword:
- description: The password for RabbitMQ
- type: string
- hidden: true
- RabbitUserName:
- default: guest
- description: The username for RabbitMQ
- type: string
- RabbitClientUseSSL:
- default: false
- description: >
- Rabbit client subscriber parameter to specify
- an SSL connection to the RabbitMQ host.
- type: string
- RabbitClientPort:
- default: 5672
- description: Set rabbit subscriber port, change this if using SSL
- type: number
RedisPassword:
description: The password for Redis
type: string
@@ -478,11 +456,6 @@ resources:
instance_name_template: {get_param: InstanceNameTemplate}
fencing_config: {get_param: FencingConfig}
pcsd_password: {get_param: PcsdPassword}
- rabbit_username: {get_param: RabbitUserName}
- rabbit_password: {get_param: RabbitPassword}
- rabbit_cookie: {get_param: RabbitCookie}
- rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
- rabbit_client_port: {get_param: RabbitClientPort}
control_virtual_interface: {get_param: ControlVirtualInterface}
public_virtual_interface: {get_param: PublicVirtualInterface}
swift_hash_suffix: {get_param: SwiftHashSuffix}
@@ -517,7 +490,6 @@ resources:
template: "NETWORK_subnet"
params:
NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
- rabbitmq_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitmqNetwork]}]}
redis_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
redis_vip: {get_param: RedisVirtualIP}
sahara_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}
@@ -677,9 +649,6 @@ resources:
# Sahara
sahara::host: {get_input: sahara_api_network}
- # RabbitMQ
- rabbitmq::node_ip_address: {get_input: rabbitmq_network}
- rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
# Redis
redis::bind: {get_input: redis_network}
redis_vip: {get_input: redis_vip}