Merge "surveil-os-interface: Include instance metadata in custom fields"

This commit is contained in:
Jenkins 2015-06-25 13:29:05 +00:00 committed by Gerrit Code Review
commit a22aa36dd3

View File

@ -154,7 +154,10 @@ def main():
"_OS_TENANT_NAME": daemon_config["SURVEIL_OS_TENANT_NAME"], "_OS_TENANT_NAME": daemon_config["SURVEIL_OS_TENANT_NAME"],
"_OS_USERNAME": daemon_config["SURVEIL_OS_USERNAME"], "_OS_USERNAME": daemon_config["SURVEIL_OS_USERNAME"],
"_OS_PASSWORD": daemon_config["SURVEIL_OS_PASSWORD"], "_OS_PASSWORD": daemon_config["SURVEIL_OS_PASSWORD"],
"_OS_INSTANCE_ID": event['payload']['instance_id'] "_OS_INSTANCE_ID": event['payload']['instance_id'],
"_OS_INSTANCE_METADATA": json.dumps(
event['payload']['metadata']
),
} }
surveil_metadata_custom_fields = event['payload']['metadata'].get( surveil_metadata_custom_fields = event['payload']['metadata'].get(