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/compute-puppet.yaml | |
| parent | 97b1e35b8f527d6971960f9526535557ce7d33bd (diff) | |
| parent | 7e96bb748561cfd13bae9f048ebbbf7a0f631fd1 (diff) | |
Merge "Provide RabbitMQ clients with a list of servers instead of VIP"
Diffstat (limited to 'puppet/compute-puppet.yaml')
| -rw-r--r-- | puppet/compute-puppet.yaml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 367bc405..7843447f 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -291,6 +291,7 @@ resources: - compute - ceph_cluster # provided by CephClusterConfig - ceph + - all_nodes # provided by allNodesConfig - '"%{::osfamily}"' - common datafiles: @@ -304,7 +305,6 @@ resources: nova::compute::vncserver_proxyclient_address: local-ipv4 mapped_data: nova::debug: {get_input: debug} - nova::rabbit_hosts: {get_input: rabbit_hosts} nova::rabbit_userid: {get_input: rabbit_username} nova::rabbit_password: {get_input: rabbit_password} nova::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} @@ -316,7 +316,6 @@ resources: nova_enable_rbd_backend: {get_input: nova_enable_rbd_backend} nova_password: {get_input: nova_password} ceilometer::debug: {get_input: debug} - ceilometer::rabbit_hosts: {get_input: rabbit_hosts} ceilometer::rabbit_userid: {get_input: rabbit_username} ceilometer::rabbit_password: {get_input: rabbit_password} ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} @@ -329,7 +328,6 @@ resources: snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} nova::glance_api_servers: {get_input: glance_api_servers} neutron::debug: {get_input: debug} - neutron::rabbit_hosts: {get_input: rabbit_hosts} neutron::rabbit_password: {get_input: rabbit_password} neutron::rabbit_user: {get_input: rabbit_user} neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} @@ -418,11 +416,6 @@ resources: - {get_param: NeutronHost} - ':35357/v2.0' admin_password: {get_param: AdminPassword} - rabbit_hosts: - str_replace: - template: '["host"]' - params: - host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} |