Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173294
Change subject: Move openstack_version and use_neutron into hiera
......................................................................
Move openstack_version and use_neutron into hiera
Change-Id: Ib4e47dee8f550514017b09a2decb143f72a11c7e
---
M hieradata/eqiad.yaml
M manifests/role/glance.pp
M manifests/role/keystone.pp
M manifests/role/neutron.pp
M manifests/role/nova.pp
M manifests/site.pp
6 files changed, 28 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/173294/1
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index ddbdd9a..47515c6 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -30,3 +30,10 @@
ocg::nagios::check::wrj: 500
ocg::nagios::check::crj: 3000
ocg::ganglia::module::data_filesystem: "/srv"
+
+#
+# Labs
+#
+openstack_version: "havana"
+use_neutron: false
+
diff --git a/manifests/role/glance.pp b/manifests/role/glance.pp
index 9fe7864..3d4ed1c 100644
--- a/manifests/role/glance.pp
+++ b/manifests/role/glance.pp
@@ -40,7 +40,7 @@
$glanceconfig = merge($eqiadglanceconfig, $commonglanceconfig)
}
-class role::glance::server {
+class role::glance::server ($openstack_version = 'havana') {
include role::glance::config::eqiad
if $::realm == 'labs' and $::openstack_site_override != undef {
diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index c4b38ec..c6dc847 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -52,7 +52,7 @@
$keystoneconfig = merge($eqiadkeystoneconfig, $commonkeystoneconfig)
}
-class role::keystone::server ($glanceconfig) {
+class role::keystone::server ($openstack_version = 'havana', $glanceconfig) {
include role::keystone::config::eqiad
if $::realm == 'labs' and $::openstack_site_override != undef {
diff --git a/manifests/role/neutron.pp b/manifests/role/neutron.pp
index d25947a..7fb6c29 100644
--- a/manifests/role/neutron.pp
+++ b/manifests/role/neutron.pp
@@ -68,7 +68,7 @@
}
}
-class role::neutron::nethost {
+class role::neutron::nethost ($openstack_version = 'havana') {
include role::neutron::config::eqiad
$neutronconfig = $role::neutron::config::eqiad::neutronconfig
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index b0dd226..f95f1d8 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -12,7 +12,8 @@
}
}
-class role::nova::config::common {
+class role::nova::config::common ($use_neutron = false) {
+
include passwords::openstack::nova
include passwords::openstack::neutron
@@ -151,7 +152,8 @@
}
}
-class role::nova::common {
+class role::nova::common ($openstack_version = 'havana') {
+
include role::nova::config
$novaconfig = $role::nova::config::novaconfig
@@ -175,7 +177,8 @@
include role::nova::wikiupdates
}
-class role::nova::manager {
+class role::nova::manager ($openstack_version = 'havana') {
+
include role::nova::config
$novaconfig = $role::nova::config::novaconfig
@@ -206,7 +209,8 @@
}
}
-class role::nova::controller {
+class role::nova::controller ($openstack_version = 'havana') {
+
include role::nova::config
$novaconfig = $role::nova::config::novaconfig
@@ -293,7 +297,8 @@
}
}
-class role::nova::api {
+class role::nova::api ($openstack_version = 'havana') {
+
include role::nova::config
$novaconfig = $role::nova::config::novaconfig
@@ -312,7 +317,8 @@
}
}
-class role::nova::network {
+class role::nova::network ($openstack_version = 'havana') {
+
include role::nova::config
$novaconfig = $role::nova::config::novaconfig
@@ -344,7 +350,7 @@
}
}
-class role::nova::wikiupdates {
+class role::nova::wikiupdates ($openstack_version = 'havana') {
if $::realm == 'production' {
if ! defined(Package['python-mwclient']) {
@@ -380,7 +386,11 @@
}
}
-class role::nova::compute {
+class role::nova::compute (
+ $openstack_version = 'havana',
+ $use_neutron = false
+ ) {
+
include role::nova::config
$novaconfig = $role::nova::config::novaconfig
diff --git a/manifests/site.pp b/manifests/site.pp
index 3b16485..ff5b62e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2815,8 +2815,6 @@
$ganglia_aggregator = true
$is_puppet_master = true
$is_labs_puppet_master = true
- $openstack_version = 'havana'
- $use_neutron = false
include standard
include admin
@@ -2838,8 +2836,6 @@
$ganglia_aggregator = true
#$is_puppet_master = true
#$is_labs_puppet_master = true
- #$openstack_version = 'folsom'
- #$use_neutron = false
include standard
include admin
@@ -2859,8 +2855,6 @@
$cluster = 'virt'
#$is_puppet_master = true
#$is_labs_puppet_master = true
- #$openstack_version = 'folsom'
- #$use_neutron = false
include standard
include admin
@@ -2875,8 +2869,6 @@
node 'labnet1001.eqiad.wmnet' {
$cluster = 'virt'
- $openstack_version = 'havana'
- $use_neutron = false
$ganglia_aggregator = true
@@ -2893,8 +2885,6 @@
node /virt100[1-5].eqiad.wmnet/ {
$cluster = 'virt'
- $openstack_version = 'havana'
- $use_neutron = false
include admin
include standard
@@ -2906,8 +2896,6 @@
node 'virt1006.eqiad.wmnet' {
$cluster = 'virt'
- $openstack_version = 'havana'
- $use_neutron = false
include admin
include standard
@@ -2919,8 +2907,6 @@
node /virt100[7-9].eqiad.wmnet/ {
$cluster = 'virt'
- $openstack_version = 'havana'
- $use_neutron = false
include admin
include standard
--
To view, visit https://gerrit.wikimedia.org/r/173294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4e47dee8f550514017b09a2decb143f72a11c7e
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
