Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322943
Change subject: Move the role::labs::openstack::nova::wikiupdates to
openstack::nova::hooks
......................................................................
Move the role::labs::openstack::nova::wikiupdates to openstack::nova::hooks
It's not really a role, and I want to use it elsewhere.
This should be a no-op.
Change-Id: I3dfbae359749ed0bf364a50fd8cdcea8eeada451
---
A modules/openstack/manifests/nova/hooks.pp
M modules/role/manifests/labs/openstack/nova.pp
2 files changed, 33 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/322943/1
diff --git a/modules/openstack/manifests/nova/hooks.pp
b/modules/openstack/manifests/nova/hooks.pp
new file mode 100644
index 0000000..56f71ac
--- /dev/null
+++ b/modules/openstack/manifests/nova/hooks.pp
@@ -0,0 +1,30 @@
+# Hook nova notification events for instance
+# page updates
+class openstack::nova::hooks(
+ $openstack_version = $::openstack::version)
+{
+ require openstack
+ if ! defined(Package['python-mwclient']) {
+ package { 'python-mwclient':
+ ensure => latest,
+ }
+ }
+
+ file { '/usr/lib/python2.7/dist-packages/wikistatus':
+ source =>
"puppet:///modules/openstack/${openstack_version}/nova/wikistatus",
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ require => Package['python-mwclient'],
+ recurse => true,
+ }
+
+ file { '/usr/lib/python2.7/dist-packages/wikistatus.egg-info':
+ source =>
"puppet:///modules/openstack/${openstack_version}/nova/wikistatus.egg-info",
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ require => Package['python-mwclient'],
+ recurse => true,
+ }
+}
diff --git a/modules/role/manifests/labs/openstack/nova.pp
b/modules/role/manifests/labs/openstack/nova.pp
index 673f9e9..919f31c 100644
--- a/modules/role/manifests/labs/openstack/nova.pp
+++ b/modules/role/manifests/labs/openstack/nova.pp
@@ -1,7 +1,7 @@
class role::labs::openstack::nova::common {
include passwords::misc::scripts
- include role::labs::openstack::nova::wikiupdates
+ include openstack::nova::hooks
$novaconfig_pre = hiera_hash('novaconfig', {})
$keystoneconfig = hiera_hash('keystoneconfig', {})
@@ -163,7 +163,7 @@
system::role { $name: }
require openstack
- include role::labs::openstack::nova::wikiupdates
+ include openstack::nova::hooks
include role::labs::openstack::glance::server
include role::labs::openstack::keystone::server
include ::openstack::nova::conductor
@@ -284,7 +284,7 @@
require openstack
system::role { $name: }
- include role::labs::openstack::nova::wikiupdates
+ include openstack::nova::hooks
include role::labs::openstack::nova::common
$novaconfig = $role::labs::openstack::nova::common::novaconfig
@@ -303,33 +303,6 @@
class { '::openstack::nova::network':
novaconfig => $novaconfig,
- }
-}
-
-class role::labs::openstack::nova::wikiupdates {
- require openstack
- if ! defined(Package['python-mwclient']) {
- package { 'python-mwclient':
- ensure => latest,
- }
- }
-
- file { '/usr/lib/python2.7/dist-packages/wikistatus':
- source =>
"puppet:///modules/openstack/${::openstack::version}/nova/wikistatus",
- owner => 'root',
- group => 'root',
- mode => '0644',
- require => Package['python-mwclient'],
- recurse => true,
- }
-
- file { '/usr/lib/python2.7/dist-packages/wikistatus.egg-info':
- source =>
"puppet:///modules/openstack/${::openstack::version}/nova/wikistatus.egg-info",
- owner => 'root',
- group => 'root',
- mode => '0644',
- require => Package['python-mwclient'],
- recurse => true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/322943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dfbae359749ed0bf364a50fd8cdcea8eeada451
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
