Andrew Bogott has submitted this change and it was merged.
Change subject: Copy over a couple more features from essex
......................................................................
Copy over a couple more features from essex
Change-Id: Iafc4a0116027249df7f6188dbdacafaf5cfce4d6
---
M setup.py
M wikistatus/wikistatus.py
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
diff --git a/setup.py b/setup.py
index 4a49fec..1e8adcc 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
setuptools.setup(
name="openstack-wikistatus",
- version="2013.4",
+ version="2013.5",
author="Wikimedia Foundation",
author_email="[email protected]",
description="Nova plugin that posts live instance status to a wiki page",
diff --git a/wikistatus/wikistatus.py b/wikistatus/wikistatus.py
index 824827d..9ee53ce 100644
--- a/wikistatus/wikistatus.py
+++ b/wikistatus/wikistatus.py
@@ -40,6 +40,12 @@
cfg.StrOpt('wiki_page_prefix',
default='InstanceStatus_',
help='Created pages will have form <prefix>_<instancename>.'),
+ cfg.StrOpt('wiki_instance_region',
+ default='Unknown',
+ help='Hard-coded region name for wiki page. A bit of a hack.'),
+ cfg.StrOpt('wiki_instance_dns_domain',
+ default='',
+ help='Hard-coded domain for wiki page. E.g. pmtpa.wmflabs'),
cfg.StrOpt('wiki_login',
default='andrewbogott',
help='Account used to edit wiki pages.'),
--
To view, visit https://gerrit.wikimedia.org/r/64655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafc4a0116027249df7f6188dbdacafaf5cfce4d6
Gerrit-PatchSet: 2
Gerrit-Project: openstack-wikistatus
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
