summaryrefslogtreecommitdiffstats
path: root/puppet/cinder-storage-puppet.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-05-07 13:05:13 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-05-19 07:09:28 -0400
commit7e96bb748561cfd13bae9f048ebbbf7a0f631fd1 (patch)
tree211d5b51e6b5edd3a3d23158b51fb3c0ff91fa3c /puppet/cinder-storage-puppet.yaml
parente4165af938510ff1352b9657e1e3942f1803e0a7 (diff)
Provide RabbitMQ clients with a list of servers instead of VIP
This will change the way how RabbitMQ clients get to the servers, they will not go through HAProxy anymore. Change-Id: I522d7520b383a280505e0e7c8fecba9ac02d2c9b
Diffstat (limited to 'puppet/cinder-storage-puppet.yaml')
-rw-r--r--puppet/cinder-storage-puppet.yaml7
1 files changed, 1 insertions, 6 deletions
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index 708f6a9b..d3cbc531 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -149,11 +149,6 @@ resources:
size: {get_param: CinderLVMLoopDeviceSize}
cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend}
cinder_iscsi_helper: {get_param: CinderISCSIHelper}
- rabbit_hosts:
- str_replace:
- template: '["host"]'
- params:
- host: {get_param: VirtualIP}
rabbit_username: {get_param: RabbitUserName}
rabbit_password: {get_param: RabbitPassword}
rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
@@ -176,6 +171,7 @@ resources:
hierarchy:
- heat_config_%{::deploy_config_name}
- volume
+ - all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- common
datafiles:
@@ -191,7 +187,6 @@ resources:
cinder::setup_test_volume::size: {get_input: cinder_lvm_loop_device_size}
cinder_iscsi_helper: {get_input: cinder_iscsi_helper}
cinder::database_connection: {get_input: cinder_dsn}
- cinder::rabbit_hosts: {get_input: rabbit_hosts}
cinder::rabbit_userid: {get_input: rabbit_username}
cinder::rabbit_password: {get_input: rabbit_password}
cinder::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}