Update paste, policy and rootwrap configurations 2016-10-12

Change-Id: I6c7d3ed938ed839b22378002ce77f239ff721e7b

templates/api_paste.ini.j2

@@ -5,7 +5,7 @@
 
 # Remove authtoken from the pipeline if you don't want to use keystone authentication
 [pipeline:main]
-pipeline = cors request_id authtoken api-server
+pipeline = cors http_proxy_to_wsgi request_id authtoken api-server
 
 [app:api-server]
 paste.app_factory = ceilometer.api.app:app_factory
@@ -19,3 +19,7 @@ paste.filter_factory = oslo_middleware:RequestId.factory
 [filter:cors]
 paste.filter_factory = oslo_middleware.cors:filter_factory
 oslo_config_project = ceilometer
+
+[filter:http_proxy_to_wsgi]
+paste.filter_factory = oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory
+oslo_config_project = ceilometer

templates/gnocchi_resources.yaml.j2

@@ -66,14 +66,10 @@ resources:
       server_group: resource_metadata.user_metadata.server_group
     event_delete: compute.instance.delete.start
     event_attributes:
-      id: instance_id
+      id: payload.instance_id
     event_associated_resources:
-      instance_network_interface:
-        query: '{"=": {"instance_id": "%s"}}'
-        fields: [id]
-      instance_disk:
-        query: '{"=": {"instance_id": "%s"}}'
-        fields: [id]
+      instance_network_interface: '{"=": {"instance_id": "%s"}}'
+      instance_disk: '{"=": {"instance_id": "%s"}}'
 
   - resource_type: instance_network_interface
     metrics:
@@ -120,7 +116,7 @@ resources:
       disk_format: resource_metadata.disk_format
     event_delete: image.delete
     event_attributes:
-      id: resource_id
+      id: payload.resource_id
 
   - resource_type: ipmi
     metrics: