Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/109858
Change subject: ::qualify the global openstack_version
......................................................................
::qualify the global openstack_version
Also add some comments... in general I'm just cleaning
this code up as I read and understand it.
Change-Id: Ieabe57394392281a0e6f793980e5149e6c13b298
---
M manifests/role/nova.pp
M manifests/site.pp
2 files changed, 24 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/109858/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 2f11f84..0e964d0 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -1,3 +1,4 @@
+# Base class, should not be used directly.
class role::nova::config {
include role::nova::config::pmtpa,
role::nova::config::eqiad
@@ -8,6 +9,7 @@
}
}
+# Base class, should not be used directly.
class role::nova::config::common {
include passwords::openstack::nova
@@ -36,6 +38,8 @@
}
}
+# Organizational class used in role::nova::config
+# not to be included directly.
class role::nova::config::pmtpa inherits role::nova::config::common {
include role::keystone::config::pmtpa
@@ -126,6 +130,8 @@
}
}
+# Organizational class used in role::nova::config
+# not to be included directly.
class role::nova::config::eqiad inherits role::nova::config::common {
include role::keystone::config::eqiad
@@ -208,7 +214,7 @@
include passwords::misc::scripts
class { "openstack::common":
- openstack_version => $openstack_version,
+ openstack_version => $::openstack_version,
novaconfig => $novaconfig,
instance_status_wiki_host => "wikitech.wikimedia.org",
instance_status_wiki_domain => "labs",
@@ -239,7 +245,7 @@
install_certificate{ $certificate: }
class { "openstack::openstack-manager":
- openstack_version => $openstack_version,
+ openstack_version => $::openstack_version,
novaconfig => $novaconfig,
certificate => $certificate,
}
@@ -265,12 +271,12 @@
include role::nova::common
- class { "openstack::scheduler-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
- class { "openstack::glance-service": openstack_version =>
$openstack_version, glanceconfig => $glanceconfig }
- class { "openstack::queue-server": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::scheduler-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
+ class { "openstack::glance-service": openstack_version =>
$::openstack_version, glanceconfig => $glanceconfig }
+ class { "openstack::queue-server": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
class { "openstack::firewall": }
class { "openstack::database-server":
- openstack_version => $openstack_version,
+ openstack_version => $::openstack_version,
novaconfig => $novaconfig,
glanceconfig => $glanceconfig,
keystoneconfig => $keystoneconfig,
@@ -287,9 +293,11 @@
include role::nova::common
- class { "openstack::api-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::api-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
}
+# Used as part of role::nova::network,
+# do not include directly.
class role::nova::network::bonding {
interface::aggregate { "bond1": orig_interface => "eth1", members => [
"eth1", "eth2", "eth3" ] }
}
@@ -314,16 +322,18 @@
}
}
- class { "openstack::network-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::network-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
}
+# Organizational class used by role::nova::compute; should not
+# be included directly.
class role::nova::wikiupdates {
if $::realm == "production" {
package { 'python-mwclient': ensure => latest; }
}
- if ($openstack_version == "essex") {
+ if ($::openstack_version == "essex") {
if ($::lsbdistcodename == "lucid") {
file {
"/usr/local/lib/python2.6/dist-packages/wikinotifier.py":
source =>
"puppet:///files/openstack/essex/nova/wikinotifier.py",
@@ -366,7 +376,7 @@
down => 'ip link set $IFACE down',
}
- class { "openstack::compute-service": openstack_version =>
$openstack_version, novaconfig => $novaconfig }
+ class { "openstack::compute-service": openstack_version =>
$::openstack_version, novaconfig => $novaconfig }
if $realm == "labs" {
include role::nova::api,
diff --git a/manifests/site.pp b/manifests/site.pp
index fecc6cf..79a9702 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2542,7 +2542,7 @@
$ganglia_aggregator = true
$is_puppet_master = "true"
$is_labs_puppet_master = "true"
- $openstack_version = "folsom"
+ $::openstack_version = "folsom"
# full root for mhoover, Labs migration contractor
include admins::labs
@@ -2563,7 +2563,7 @@
$is_puppet_master = "true"
$is_labs_puppet_master = "true"
- $openstack_version = "folsom"
+ $::openstack_version = "folsom"
# full root for mhoover, Labs migration contractor
include admins::labs
@@ -2582,7 +2582,7 @@
node 'virt2.pmtpa.wmnet' {
$cluster = "virt"
- $openstack_version = "folsom"
+ $::openstack_version = "folsom"
# full root for mhoover, Labs migration contractor
include admins::labs
@@ -2600,7 +2600,7 @@
$ganglia_aggregator = true
}
- $openstack_version = "folsom"
+ $::openstack_version = "folsom"
# full root for mhoover, Labs migration contractor
include admins::labs
--
To view, visit https://gerrit.wikimedia.org/r/109858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieabe57394392281a0e6f793980e5149e6c13b298
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
