summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2015-10-24 08:06:39 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-10-24 08:06:39 +0000
commit4d2673fbf7dc77113309c2ce50eaa2b850c7825e (patch)
tree83ebbb2486a833c0dd61cb12603d723380918690 /deploy/adapters
parent951186fee0c3a83fe380cc7545edcbdc6872e509 (diff)
parent73f24ad92bca0a14be12eedc03bc0e1c9fd6b31e (diff)
Merge "AMQP server is unreachable"
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j21
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j21
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j21
3 files changed, 3 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
index d3ee52ab..716317da 100644
--- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
@@ -2,6 +2,7 @@
verbose = True
rpc_backend = rabbit
rabbit_host = {{ internal_vip.ip }}
+rabbit_userid = {{ RABBIT_USER }}
rabbit_password = {{ RABBIT_PASS }}
[publisher]
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
index 09ca5272..c2993885 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
@@ -1,6 +1,7 @@
[DEFAULT]
rpc_backend = rabbit
rabbit_host = {{ internal_vip.ip }}
+rabbit_userid = {{ RABBIT_USER }}
rabbit_password = {{ RABBIT_PASS }}
auth_strategy = keystone
verbose = True
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2
index c34f5d81..616e7e05 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/glance.j2
@@ -2,4 +2,5 @@
notification_driver = messagingv2
rpc_backend = rabbit
rabbit_host = {{ internal_vip.ip }}
+rabbit_userid = {{ RABBIT_USER }}
rabbit_password = {{ RABBIT_PASS }}