Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102185
Change subject: Enable a labs site override option for nova config
......................................................................
Enable a labs site override option for nova config
It's necessary to test multiple regions of openstack within labs
so this change allows the configuration to pretend it's a different
site.
Change-Id: I4308d0ac71051044179acfc408c32607ea751033
---
M manifests/role/glance.pp
M manifests/role/keystone.pp
M manifests/role/nova.pp
3 files changed, 49 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/102185/1
diff --git a/manifests/role/glance.pp b/manifests/role/glance.pp
index 772ff77..a034e86 100644
--- a/manifests/role/glance.pp
+++ b/manifests/role/glance.pp
@@ -56,9 +56,16 @@
include role::glance::config::pmtpa,
role::glance::config::eqiad
- $glanceconfig = $site ? {
- "pmtpa" => $role::glance::config::pmtpa::glanceconfig,
- "eqiad" => $role::glance::config::eqiad::glanceconfig,
+ if $::realm == "labs" and $::openstack_site_override != undef {
+ $glanceconfig = $::openstack_site_override ? {
+ "pmtpa" => $role::glance::config::pmtpa::glanceconfig,
+ "eqiad" => $role::glance::config::eqiad::glanceconfig,
+ }
+ } else {
+ $glanceconfig = $::site ? {
+ "pmtpa" => $role::glance::config::pmtpa::glanceconfig,
+ "eqiad" => $role::glance::config::eqiad::glanceconfig,
+ }
}
class { "openstack::glance-service": openstack_version =>
$openstack_version, glanceconfig => $glanceconfig }
diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index e1d44d3..be5d576 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -59,9 +59,16 @@
include role::keystone::config::pmtpa,
role::keystone::config::eqiad
- $keystoneconfig = $site ? {
- "pmtpa" => $role::keystone::config::pmtpa::keystoneconfig,
- "eqiad" => $role::keystone::config::eqiad::keystoneconfig,
+ if $::realm == "labs" and $::openstack_site_override != undef {
+ $keystoneconfig = $::openstack_site_override ? {
+ "pmtpa" =>
$role::keystone::config::pmtpa::keystoneconfig,
+ "eqiad" =>
$role::keystone::config::eqiad::keystoneconfig,
+ }
+ } else {
+ $keystoneconfig = $::site ? {
+ "pmtpa" =>
$role::keystone::config::pmtpa::keystoneconfig,
+ "eqiad" =>
$role::keystone::config::eqiad::keystoneconfig,
+ }
}
class { "openstack::keystone-service": openstack_version =>
$openstack_version, keystoneconfig => $keystoneconfig }
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 2652a27..20bd2ee 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -2,9 +2,16 @@
include role::nova::config::pmtpa,
role::nova::config::eqiad
- $novaconfig = $site ? {
- "pmtpa" => $role::nova::config::pmtpa::novaconfig,
- "eqiad" => $role::nova::config::eqiad::novaconfig,
+ if $::realm == "labs" and $::openstack_site_override != undef {
+ $novaconfig = $::openstack_site_override ? {
+ "pmtpa" => $role::nova::config::pmtpa::novaconfig,
+ "eqiad" => $role::nova::config::eqiad::novaconfig,
+ }
+ } else {
+ $novaconfig = $::site ? {
+ "pmtpa" => $role::nova::config::pmtpa::novaconfig,
+ "eqiad" => $role::nova::config::eqiad::novaconfig,
+ }
}
}
@@ -243,13 +250,24 @@
role::glance::config::pmtpa,
role::glance::config::eqiad
- $glanceconfig = $site ? {
- "pmtpa" => $role::glance::config::pmtpa::glanceconfig,
- "eqiad" => $role::glance::config::eqiad::glanceconfig,
- }
- $keystoneconfig = $site ? {
- "pmtpa" => $role::keystone::config::pmtpa::keystoneconfig,
- "eqiad" => $role::keystone::config::eqiad::keystoneconfig,
+ if $::realm == "labs" and $::openstack_site_override != undef {
+ $glanceconfig = $::openstack_site_override ? {
+ "pmtpa" => $role::glance::config::pmtpa::glanceconfig,
+ "eqiad" => $role::glance::config::eqiad::glanceconfig,
+ }
+ $keystoneconfig = $::openstack_site_override ? {
+ "pmtpa" =>
$role::keystone::config::pmtpa::keystoneconfig,
+ "eqiad" =>
$role::keystone::config::eqiad::keystoneconfig,
+ }
+ } else {
+ $glanceconfig = $::site ? {
+ "pmtpa" => $role::glance::config::pmtpa::glanceconfig,
+ "eqiad" => $role::glance::config::eqiad::glanceconfig,
+ }
+ $keystoneconfig = $::site ? {
+ "pmtpa" =>
$role::keystone::config::pmtpa::keystoneconfig,
+ "eqiad" =>
$role::keystone::config::eqiad::keystoneconfig,
+ }
}
include role::nova::common
@@ -289,7 +307,7 @@
include role::nova::common
- if ($::site == "pmtpa") {
+ if $::realm == "production" and $::site == "pmtpa" {
require role::nova::network::bonding
interface::ip {
"openstack::network_service_public_dynamic_snat": interface => "lo", address =>
$site ? { "pmtpa" => "208.80.153.192", "eqiad" => "208.80.155.255" } }
--
To view, visit https://gerrit.wikimedia.org/r/102185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4308d0ac71051044179acfc408c32607ea751033
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
