Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300293
Change subject: Use special monitor-account creds for the rabbitmq collector
......................................................................
Use special monitor-account creds for the rabbitmq collector
Change-Id: Ifc08f7b87d7aeda8e8568527e213eaf2b8e6c59a
---
M modules/openstack/manifests/queue_server.pp
M modules/role/manifests/labs/openstack/nova.pp
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/300293/1
diff --git a/modules/openstack/manifests/queue_server.pp
b/modules/openstack/manifests/queue_server.pp
index 04fc2ca..101a2a1 100644
--- a/modules/openstack/manifests/queue_server.pp
+++ b/modules/openstack/manifests/queue_server.pp
@@ -1,7 +1,7 @@
# sets up rabbitmq on the nova controller
class openstack::queue_server(
- $rabbit_username,
- $rabbit_password
+ $rabbit_monitor_username,
+ $rabbit_monitor_password
) {
include openstack::repo
@@ -35,8 +35,8 @@
diamond::collector { 'RabbitMQ':
settings => {
'host' => 'localhost:15672',
- 'user' => $rabbit_username,
- 'password' => $rabbit_password,
+ 'user' => $rabbit_monitor_username,
+ 'password' => $rabbit_monitor_password,
},
source => 'puppet:///modules/openstack/rabbitmq/rabbitmq.py',
}
diff --git a/modules/role/manifests/labs/openstack/nova.pp
b/modules/role/manifests/labs/openstack/nova.pp
index 7ded921..c147a89 100644
--- a/modules/role/manifests/labs/openstack/nova.pp
+++ b/modules/role/manifests/labs/openstack/nova.pp
@@ -143,8 +143,8 @@
$designateconfig = hiera_hash('designateconfig', {})
class { '::openstack::queue_server':
- rabbit_username => $novaconfig['rabbit_user'],
- rabbit_password => $novaconfig['rabbit_pass'],
+ rabbit_monitor_username => $novaconfig['rabbit_monitor_user'],
+ rabbit_monitor_password => $novaconfig['rabbit_monitor_pass'],
}
class { '::openstack::adminscripts':
--
To view, visit https://gerrit.wikimedia.org/r/300293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc08f7b87d7aeda8e8568527e213eaf2b8e6c59a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
