Andrew Bogott has submitted this change and it was merged.
Change subject: Use m5-master.eqiad.wmnet for the openstack/labs db server
......................................................................
Use m5-master.eqiad.wmnet for the openstack/labs db server
Change-Id: I5540a4287342b9a4711a8044aa8ecbcf228d36ec
---
M manifests/role/glance.pp
M manifests/role/keystone.pp
M manifests/role/neutron.pp
M manifests/role/nova.pp
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/glance.pp b/manifests/role/glance.pp
index 12101c8..26be2a1 100644
--- a/manifests/role/glance.pp
+++ b/manifests/role/glance.pp
@@ -17,7 +17,7 @@
$keystoneconfig = $role::keystone::config::eqiad::keystoneconfig
$db_host = $::realm ? {
- 'production' => 'virt1000.wikimedia.org',
+ 'production' => 'm5-master.eqiad.wmnet',
'labs' => $::ipaddress_eth0,
}
diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index ee6eac6..29eeae2 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -24,7 +24,7 @@
class role::keystone::config::eqiad inherits role::keystone::config {
$eqiadkeystoneconfig = {
db_host => $::realm ? {
- 'production' => 'virt1000.wikimedia.org',
+ 'production' => 'm5-master.eqiad.wmnet',
'labs' => $nova_controller_hostname ? {
undef => $::ipaddress_eth0,
default => $nova_controller_hostname,
diff --git a/manifests/role/neutron.pp b/manifests/role/neutron.pp
index d66ba58..74ed3ad 100644
--- a/manifests/role/neutron.pp
+++ b/manifests/role/neutron.pp
@@ -20,7 +20,7 @@
$eqiadneutronconfig = {
db_host => $::realm ? {
- 'production' => 'virt1000.wikimedia.org',
+ 'production' => 'm5-master.eqiad.wmnet',
'labs' => 'localhost',
},
rabbit_host => $::realm ? {
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 34be80b..afd8e98 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -187,7 +187,7 @@
}
$eqiadnovaconfig = {
- db_host => $controller_hostname,
+ db_host => 'm5-master.eqiad.wmnet',
dhcp_domain => 'eqiad.wmflabs',
glance_host => $controller_hostname,
rabbit_host => $controller_hostname,
--
To view, visit https://gerrit.wikimedia.org/r/211120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5540a4287342b9a4711a8044aa8ecbcf228d36ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
