Andrew Bogott has submitted this change and it was merged.
Change subject: More fixes for icehouse
......................................................................
More fixes for icehouse
Change-Id: Ia3dc1004dae2a9e0c628d9830fe8652cb43d07e5
---
M wikistatus/wikistatus.py
1 file changed, 21 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
diff --git a/wikistatus/wikistatus.py b/wikistatus/wikistatus.py
index a025c9b..a14a24d 100644
--- a/wikistatus/wikistatus.py
+++ b/wikistatus/wikistatus.py
@@ -19,6 +19,7 @@
from keystoneclient.v2_0 import client as keystoneclient
from nova import conductor
+import nova.context
from nova import exception
from nova import image
from nova import network
@@ -148,7 +149,23 @@
return self.kclient[tenant_id]
- def notify(self, ctxt, message, priority):
+ def _deserialize_context(self, contextdict):
+
+ context = nova.context.RequestContext(**contextdict)
+ return context
+
+ context = nova.context.RequestContext(
+ auth_token=contextdict['auth_token'],
+ user=contextdict['user'],
+ tenant=contextdict['tenant'],
+ is_admin=contextdict['is_admin'],
+ request_id=contextdict['request_id'])
+
+ return context
+
+ def notify(self, context, message, priority):
+ ctxt = self._deserialize_context(context)
+
event_type = message.get('event_type')
if event_type in CONF.wiki_eventtype_blacklist:
return
@@ -174,7 +191,8 @@
template_param_dict['tenant'] = tenant_name
template_param_dict['username'] = user_name
- inst = self.conductor_api.instance_get_by_uuid(ctxt,
payload['instance_id'])
+ inst = self.conductor_api.instance_get_by_uuid(ctxt,
+ payload['instance_id'])
simple_id = inst['id']
ec2_id = 'i-%08x' % simple_id
@@ -214,7 +232,7 @@
template_param_dict['private_ip'] = ','.join(ips)
template_param_dict['public_ip'] = ','.join(floating_ips)
- sec_groups = self.conductor_api.security_group_get_by_instance(ctxt,
inst)
+ sec_groups = inst['security_groups']
grps = [grp['name'] for grp in sec_groups]
template_param_dict['security_group'] = ','.join(grps)
--
To view, visit https://gerrit.wikimedia.org/r/174711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3dc1004dae2a9e0c628d9830fe8652cb43d07e5
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
