diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-20 14:51:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-20 14:51:19 +0000 |
| commit | f1df334e902867f2a81d8f46ee0f45a126b3516e (patch) | |
| tree | b4d45a3b385069623366991cff17309358f3b1e7 /puppet/cinder-storage-puppet.yaml | |
| parent | 97b1e35b8f527d6971960f9526535557ce7d33bd (diff) | |
| parent | 7e96bb748561cfd13bae9f048ebbbf7a0f631fd1 (diff) | |
Merge "Provide RabbitMQ clients with a list of servers instead of VIP"
Diffstat (limited to 'puppet/cinder-storage-puppet.yaml')
| -rw-r--r-- | puppet/cinder-storage-puppet.yaml | 7 |
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} |