x/surveil
Code Issues Proposed changes

Merge "RabbitConsumer: Load custom_fields from nova tags"

Browse Source
This commit is contained in:
Jenkins 2015-06-01 14:32:53 +00:00 committed by Gerrit Code Review
commit 64bf1b8797
1 changed files with 13 additions and 0 deletions

13
surveil/cmd/rabbitMQ_consumer.py

@ -147,6 +147,19 @@ def main():
"_OS_INSTANCE_ID": event['payload']['instance_id']
}
surveil_metadata_custom_fields = event['payload']['metadata'].get(
'surveil_custom_fields',
None
)
if surveil_metadata_custom_fields is not None:
try:
custom_fields.update(
json.loads(surveil_metadata_custom_fields)
)
except ValueError:
print("Could not load json %s" %
surveil_metadata_custom_fields)
instance_tags = daemon_config["SURVEIL_DEFAULT_TAGS"]
surveil_metadata_tags = event['payload']['metadata'].get(
'surveil_tags',