Andrew Bogott has submitted this change and it was merged.
Change subject: Use python-openstack-wikistatus on folsom.
......................................................................
Use python-openstack-wikistatus on folsom.
In essex we're using a hackish single python file
that drops into /usr/lib/python2.x. With folsom's plugin
support we can use a proper package and entrypoints and such.
Change-Id: If646df5a288c0ab4942095e051b52821f42fe9b9
---
M manifests/role/nova.pp
M templates/openstack/folsom/nova/nova.conf.erb
2 files changed, 27 insertions(+), 23 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index bdc4a8c..2e51da6 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -310,25 +310,32 @@
include base::mwclient
- if ($::lsbdistcodename == "lucid") {
- file { "/usr/local/lib/python2.6/dist-packages/wikinotifier.py":
- source =>
"puppet:///files/openstack/essex/nova/wikinotifier.py",
- mode => 0644,
- owner => root,
- group => root,
- require => package["python-mwclient"],
- notify => Service["nova-compute"]
- }
- } else {
- file { "/usr/local/lib/python2.7/dist-packages/wikinotifier.py":
- source =>
"puppet:///files/openstack/essex/nova/wikinotifier.py",
- mode => 0644,
- owner => root,
- group => root,
- require => package["python-mwclient"],
- notify => Service["nova-compute"]
- }
- }
+ 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",
+ mode => 0644,
+ owner => root,
+ group => root,
+ require => package["python-mwclient"],
+ notify => Service["nova-compute"]
+ }
+ } else {
+ file {
"/usr/local/lib/python2.7/dist-packages/wikinotifier.py":
+ source =>
"puppet:///files/openstack/essex/nova/wikinotifier.py",
+ mode => 0644,
+ owner => root,
+ group => root,
+ require => package["python-mwclient"],
+ notify => Service["nova-compute"]
+ }
+ }
+ } else {
+ package { 'python-openstack-wikistatus':
+ ensure => installed,
+ require => package["python-mwclient"],
+ }
+ }
}
class role::nova::compute {
diff --git a/templates/openstack/folsom/nova/nova.conf.erb
b/templates/openstack/folsom/nova/nova.conf.erb
index 9bca5d2..802e863 100644
--- a/templates/openstack/folsom/nova/nova.conf.erb
+++ b/templates/openstack/folsom/nova/nova.conf.erb
@@ -47,10 +47,7 @@
force_dhcp_release=True
iscsi_helper=tgtadm
-# Settings for wikistatus, the add-on that updates OSM with instance status:
-notification_driver=nova.notifier.list_notifier
-list_notifier_drivers=wikinotifier.WikiStatus
-
+# Settings for wikistatus, the plugin that updates OSM with instance status:
wiki_host=<%= instance_status_wiki_host %>
wiki_domain=<%= instance_status_wiki_domain %>
wiki_page_prefix=<%= instance_status_wiki_page_prefix %>
--
To view, visit https://gerrit.wikimedia.org/r/64642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If646df5a288c0ab4942095e051b52821f42fe9b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
