From 8fda2b7a938365d97073ae16d7bafad3e6c7b345 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 21 Oct 2016 14:23:28 +0100 Subject: [PATCH] Update paste, policy and rootwrap configurations 2016-10-21 Change-Id: Ie2d4bfddc36e1852928568b9ba7a7aefda97436c --- files/rootwrap.d/iptables-firewall.filters | 9 ++++----- templates/api-paste.ini.j2 | 11 +++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/files/rootwrap.d/iptables-firewall.filters b/files/rootwrap.d/iptables-firewall.filters index 29c78dae..0a81f9dd 100644 --- a/files/rootwrap.d/iptables-firewall.filters +++ b/files/rootwrap.d/iptables-firewall.filters @@ -8,21 +8,20 @@ [Filters] -# neutron/agent/linux/iptables_manager.py +# neutron/agent/linux/iptables_firewall.py # "iptables-save", ... iptables-save: CommandFilter, iptables-save, root iptables-restore: CommandFilter, iptables-restore, root ip6tables-save: CommandFilter, ip6tables-save, root ip6tables-restore: CommandFilter, ip6tables-restore, root -# neutron/agent/linux/iptables_manager.py +# neutron/agent/linux/iptables_firewall.py # "iptables", "-A", ... iptables: CommandFilter, iptables, root ip6tables: CommandFilter, ip6tables, root -# neutron/agent/linux/iptables_manager.py -# "sysctl", "-w", ... +# neutron/agent/linux/iptables_firewall.py sysctl: CommandFilter, sysctl, root # neutron/agent/linux/ip_conntrack.py -conntrack: CommandFilter, conntrack, root \ No newline at end of file +conntrack: CommandFilter, conntrack, root diff --git a/templates/api-paste.ini.j2 b/templates/api-paste.ini.j2 index 0d6873ab..1c98cfe3 100644 --- a/templates/api-paste.ini.j2 +++ b/templates/api-paste.ini.j2 @@ -5,13 +5,13 @@ use = egg:Paste#urlmap [composite:neutronapi_v2_0] use = call:neutron.auth:pipeline_factory -noauth = cors request_id catch_errors extensions neutronapiapp_v2_0 -keystone = cors request_id catch_errors authtoken keystonecontext extensions neutronapiapp_v2_0 +noauth = cors http_proxy_to_wsgi request_id catch_errors extensions neutronapiapp_v2_0 +keystone = cors http_proxy_to_wsgi request_id catch_errors authtoken keystonecontext extensions neutronapiapp_v2_0 [composite:neutronversions_composite] use = call:neutron.auth:pipeline_factory -noauth = cors neutronversions -keystone = cors neutronversions +noauth = cors http_proxy_to_wsgi neutronversions +keystone = cors http_proxy_to_wsgi neutronversions [filter:request_id] paste.filter_factory = oslo_middleware:RequestId.factory @@ -23,6 +23,9 @@ paste.filter_factory = oslo_middleware:CatchErrors.factory paste.filter_factory = oslo_middleware.cors:filter_factory oslo_config_project = neutron +[filter:http_proxy_to_wsgi] +paste.filter_factory = oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory + [filter:keystonecontext] paste.filter_factory = neutron.auth:NeutronKeystoneContext.factory