Andrew Bogott has submitted this change and it was merged.
Change subject: Move status page to Nova_Resource:i-xxxxxxxx id
......................................................................
Move status page to Nova_Resource:i-xxxxxxxx id
Also add a few extra fields.
Change-Id: I56e1ce09de5506623d9f5a1ec3a125825504ee79
---
M setup.py
M wikistatus/wikistatus.py
2 files changed, 24 insertions(+), 7 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
diff --git a/setup.py b/setup.py
index 3a4507f..4a49fec 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
setuptools.setup(
name="openstack-wikistatus",
- version="2013.3",
+ version="2013.4",
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 9d1d923..824827d 100644
--- a/wikistatus/wikistatus.py
+++ b/wikistatus/wikistatus.py
@@ -152,10 +152,10 @@
instance = payload['instance_id']
instance_name = payload['display_name']
- pagename = "%s%s" % (FLAGS.wiki_page_prefix, instance_name)
- LOG.debug("wikistatus: Writing instance info"
- " to page http://%s/wiki/%s"; %
- (self.host, pagename))
+ if FLAGS.wiki_instance_dns_domain:
+ fqdn = "%s.%s" % (instance_name, FLAGS.wiki_instance_dns_domain)
+ else:
+ fqdn = instance_name
if event_type == 'compute.instance.delete.end':
page_string = _("This instance has been deleted.")
@@ -177,21 +177,33 @@
inst = db.instance_get_by_uuid(ctxt, payload['instance_id'])
simple_id = inst.id
+ ec2_id = 'i-%08x' % inst.id
+
template_param_dict['cpu_count'] = inst.vcpus
template_param_dict['disk_gb_current'] = inst.ephemeral_gb
template_param_dict['host'] = inst.host
template_param_dict['reservation_id'] = inst.reservation_id
template_param_dict['availability_zone'] = inst.availability_zone
template_param_dict['original_host'] = inst.launched_on
- template_param_dict['public_ip'] = inst.access_ip_v4
+ template_param_dict['fqdn'] = fqdn
+ template_param_dict['ec2_id'] = ec2_id
+ template_param_dict['project_name'] = inst.project_id
+ template_param_dict['region'] = FLAGS.wiki_instance_region
try:
fixed_ips = db.fixed_ip_get_by_instance(ctxt,
payload['instance_id'])
except exception.FixedIpNotFoundForInstance:
fixed_ips = []
- ips = [ip.address for ip in fixed_ips]
+
+ for fixed_ip in fixed_ips:
+ ips.append(fixed_ip.address)
+ for f_ip in db.floating_ip_get_by_fixed_ip_id(ctxt,
+ fixed_ip.id):
+ floating_ips.append(f_ip.address)
+
template_param_dict['private_ip'] = ','.join(ips)
+ template_param_dict['public_ip'] = ','.join(floating_ips)
sec_groups = db.security_group_get_by_instance(ctxt, simple_id)
grps = [grp.name for grp in sec_groups]
@@ -208,6 +220,11 @@
page_string = "{{InstanceStatus%s}}" % fields_string
self._wiki_login()
+ pagename = "%s%s" % (FLAGS.wiki_page_prefix, ec2_id)
+ LOG.debug("wikistatus: Writing instance info"
+ " to page http://%s/wiki/%s"; %
+ (self.host, pagename))
+
page = self.site.Pages[pagename]
try:
page.edit()
--
To view, visit https://gerrit.wikimedia.org/r/64654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56e1ce09de5506623d9f5a1ec3a125825504ee79
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
