Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102345
Change subject: Use eth0 IP rather than localhost for multi-region
......................................................................
Use eth0 IP rather than localhost for multi-region
For testing multi-region support in labs it's necessary to use the
eth0 IP address rather than localhost so that the services will be
reachable from the OpenStackManager instance.
Change-Id: Ie92c14c0db940e6ccf5e8cc18add1e35c73d975a
---
M manifests/role/glance.pp
M manifests/role/keystone.pp
M manifests/role/nova.pp
3 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/102345/1
diff --git a/manifests/role/glance.pp b/manifests/role/glance.pp
index a034e86..d89ba25 100644
--- a/manifests/role/glance.pp
+++ b/manifests/role/glance.pp
@@ -16,11 +16,11 @@
$pmtpaglanceconfig = {
db_host => $realm ? {
"production" => "virt0.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
bind_ip => $realm ? {
"production" => "208.80.152.32",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
keystone_admin_token => $keystoneconfig["admin_token"],
keystone_auth_host => $keystoneconfig["bind_ip"],
@@ -38,11 +38,11 @@
$eqiadglanceconfig = {
db_host => $realm ? {
"production" => "virt1000.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
bind_ip => $realm ? {
"production" => "208.80.154.18",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
keystone_admin_token => $keystoneconfig["admin_token"],
keystone_auth_host => $keystoneconfig["bind_ip"],
diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index be5d576..5839d47 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -23,15 +23,15 @@
$pmtpakeystoneconfig = {
db_host => $realm ? {
"production" => "virt0.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
ldap_host => $realm ? {
"production" => "virt0.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
bind_ip => $realm ? {
"production" => "208.80.152.32",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
}
$keystoneconfig = merge($pmtpakeystoneconfig, $commonkeystoneconfig)
@@ -41,15 +41,15 @@
$eqiadkeystoneconfig = {
db_host => $realm ? {
"production" => "virt1000.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
ldap_host => $realm ? {
"production" => "virt1000.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
bind_ip => $realm ? {
"production" => "208.80.154.18",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
}
$keystoneconfig = merge($eqiadkeystoneconfig, $commonkeystoneconfig)
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 20bd2ee..dcdb65b 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -22,7 +22,7 @@
db_name => "nova",
db_user => "nova",
db_pass => $passwords::openstack::nova::nova_db_pass,
- my_ip => $ipaddress_eth0,
+ my_ip => $::ipaddress_eth0,
ldap_base_dn => "dc=wikimedia,dc=org",
ldap_user_dn => "uid=novaadmin,ou=people,dc=wikimedia,dc=org",
ldap_user_pass =>
$passwords::openstack::nova::nova_ldap_user_pass,
@@ -49,7 +49,7 @@
$keystoneconfig = $role::keystone::config::pmtpa::keystoneconfig
$controller_hostname = $realm ? {
"production" => "virt0.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
}
@@ -72,15 +72,15 @@
network_public_interface => "eth0",
network_host => $realm ? {
"production" => "10.4.0.1",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
api_host => $realm ? {
"production" => "virt2.pmtpa.wmnet",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
api_ip => $realm ? {
"production" => "10.4.0.1",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
fixed_range => $realm ? {
"production" => "10.4.0.0/21",
@@ -92,7 +92,7 @@
},
network_public_ip => $realm ? {
"production" => "208.80.153.192",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
dmz_cidr => $realm ? {
"production" => "208.80.153.0/22,10.0.0.0/8",
@@ -139,7 +139,7 @@
$keystoneconfig = $role::keystone::config::eqiad::keystoneconfig
$controller_hostname = $realm ? {
"production" => "virt1000.wikimedia.org",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
}
$eqiadnovaconfig = {
@@ -161,15 +161,15 @@
network_public_interface => "eth0",
network_host => $realm ? {
"production" => "10.68.16.1",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
api_host => $realm ? {
"production" => "virt1005.eqiad.wmnet",
- "labs" => "localhost",
+ "labs" => $::ipaddress_eth0,
},
api_ip => $realm ? {
"production" => "10.68.16.1",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
fixed_range => $realm ? {
"production" => "10.68.16.0/21",
@@ -181,7 +181,7 @@
},
network_public_ip => $realm ? {
"production" => "208.80.155.255",
- "labs" => "127.0.0.1",
+ "labs" => $::ipaddress_eth0,
},
dmz_cidr => $realm ? {
"production" => "208.80.155.0/22,10.0.0.0/8",
--
To view, visit https://gerrit.wikimedia.org/r/102345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie92c14c0db940e6ccf5e8cc18add1e35c73d975a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
