Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252702
Change subject: Move role/nova.pp into role/labs/openstack/
......................................................................
Move role/nova.pp into role/labs/openstack/
This is just a trial balloon to see how the puppet compiler
feels, and to see if other Ops hate this organization
scheme. It's not meant to be a complete refactor -- please
do not merge.
Change-Id: Ib2d9a3dc8e7ddfa741a6fa8d6080e073b65b6a96
---
R manifests/role/labs/openstack/nova.pp
M manifests/site.pp
2 files changed, 38 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/252702/1
diff --git a/manifests/role/nova.pp b/manifests/role/labs/openstack/nova.pp
similarity index 91%
rename from manifests/role/nova.pp
rename to manifests/role/labs/openstack/nova.pp
index ebaa4ef..31ce71b 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/labs/openstack/nova.pp
@@ -1,4 +1,4 @@
-class role::nova::config {
+class role::labs::openstack::nova::config {
include role::nova::config::eqiad
include role::nova::config::codfw
@@ -15,7 +15,7 @@
}
}
-class role::nova::config::common {
+class role::labs::openstack::nova::config::common {
require openstack
include passwords::openstack::nova
include passwords::openstack::ceilometer
@@ -56,7 +56,7 @@
}
}
-class role::nova::config::codfw inherits role::nova::config::common {
+class role::labs::openstack::nova::config::codfw inherits
role::labs::openstack::nova::config::common {
include role::keystone::config::eqiad
$nova_controller = hiera('labs_nova_controller')
@@ -162,7 +162,7 @@
$novaconfig = merge( $codfwnovaconfig, $commonnovaconfig )
}
-class role::nova::config::eqiad inherits role::nova::config::common {
+class role::labs::openstack::nova::config::eqiad inherits
role::labs::openstack::nova::config::common {
include role::keystone::config::eqiad
$nova_controller = hiera('labs_nova_controller')
@@ -275,9 +275,9 @@
}
}
-class role::nova::common {
- include role::nova::config
- $novaconfig = $role::nova::config::novaconfig
+class role::labs::openstack::nova::common {
+ include role::labs::openstack::nova::config
+ $novaconfig = $role::labs::openstack::nova::config::novaconfig
include passwords::misc::scripts
@@ -297,13 +297,13 @@
instance_status_wiki_pass =>
$passwords::misc::scripts::wikinotifier_pass,
}
- include role::nova::wikiupdates
+ include role::labs::openstack::nova::wikiupdates
}
# This is the wikitech UI
-class role::nova::manager {
- include role::nova::config
- $novaconfig = $role::nova::config::novaconfig
+class role::labs::openstack::nova::manager {
+ include role::labs::openstack::nova::config
+ $novaconfig = $role::labs::openstack::nova::config::novaconfig
case $::realm {
'labs': {
@@ -375,14 +375,14 @@
}
# This is nova controller stuff
-class role::nova::controller {
+class role::labs::openstack::nova::controller {
require openstack
- include role::nova::config
- $novaconfig = $role::nova::config::novaconfig
+ include role::labs::openstack::nova::config
+ $novaconfig = $role::labs::openstack::nova::config::novaconfig
include role::keystone::config::eqiad
include role::glance::config::eqiad
- include role::nova::wikiupdates
+ include role::labs::openstack::nova::wikiupdates
if $::realm == 'labs' and $::openstack_site_override != undef {
$glanceconfig = $::openstack_site_override ? {
@@ -400,7 +400,7 @@
}
}
- include role::nova::common
+ include role::labs::openstack::nova::common
class { 'openstack::nova::conductor':
novaconfig => $novaconfig,
@@ -436,32 +436,32 @@
}
}
-class role::nova::api {
+class role::labs::openstack::nova::api {
require openstack
- include role::nova::config
- $novaconfig = $role::nova::config::novaconfig
+ include role::labs::openstack::nova::config
+ $novaconfig = $role::labs::openstack::nova::config::novaconfig
- include role::nova::common
+ include role::labs::openstack::nova::common
class { 'openstack::nova::api':
novaconfig => $novaconfig,
}
}
-class role::nova::network::bonding {
+class role::labs::openstack::nova::network::bonding {
interface::aggregate { 'bond1':
orig_interface => 'eth1',
members => [ 'eth1', 'eth2', 'eth3' ],
}
}
-class role::nova::network {
+class role::labs::openstack::nova::network {
require openstack
- include role::nova::config
- $novaconfig = $role::nova::config::novaconfig
+ include role::labs::openstack::nova::config
+ $novaconfig = $role::labs::openstack::nova::config::novaconfig
- include role::nova::common
- include role::nova::wikiupdates
+ include role::labs::openstack::nova::common
+ include role::labs::openstack::nova::wikiupdates
if ($::realm == production) {
$site_address = $::site ? {
@@ -487,7 +487,7 @@
}
}
-class role::nova::wikiupdates {
+class role::labs::openstack::nova::wikiupdates {
require openstack
if $::realm == 'production' {
if ! defined(Package['python-mwclient']) {
@@ -513,15 +513,15 @@
}
}
-class role::nova::compute($instance_dev='/dev/md1') {
+class role::labs::openstack::nova::compute($instance_dev='/dev/md1') {
require openstack
- include role::nova::config
- $novaconfig = $role::nova::config::novaconfig
+ include role::labs::openstack::nova::config
+ $novaconfig = $role::labs::openstack::nova::config::novaconfig
- include role::nova::common
+ include role::labs::openstack::nova::common
ganglia::plugin::python {'diskstat': }
- system::role { 'role::nova::compute':
+ system::role { 'role::labs::openstack::nova::compute':
ensure => 'present',
description => 'openstack nova compute node',
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 547edf1..b866c31 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -7,6 +7,7 @@
import 'nfs.pp'
import 'role/*.pp'
import 'role/analytics/*.pp'
+import 'role/labs/openstack/*.pp'
# Include stages last
import 'stages.pp'
@@ -1191,7 +1192,7 @@
$is_puppet_master = true
$is_labs_puppet_master = true
$use_neutron = false
- role nova::controller
+ role labs::openstack::nova::controller
include standard
include ldap::role::client::labs
@@ -1242,8 +1243,8 @@
include base::firewall
include ldap::role::client::labs
- #include role::nova::controller
- #include role::nova::manager
+ #include role::labs::openstack::nova::controller
+ #include role::labs::openstack::nova::manager
#include role::salt::masters::labs
#include role::deployment::salt_masters
}
@@ -1263,7 +1264,7 @@
if $use_neutron == true {
#include role::neutron::nethost
} else {
- #include role::nova::network
+ #include role::labs::openstack::nova::network
}
}
@@ -1276,7 +1277,7 @@
if $use_neutron == true {
include role::neutron::nethost
} else {
- include role::nova::network
+ include role::labs::openstack::nova::network
}
}
--
To view, visit https://gerrit.wikimedia.org/r/252702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2d9a3dc8e7ddfa741a6fa8d6080e073b65b6a96
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
