From: Cedric Brandily <zzelle@gmail.com>
Date: Fri, 20 Mar 2015 16:11:53 +0000 (+0000)
Subject: Move metadata proxy shared options to neutron.conf
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3106d358f1963f9f9611018ad77eadd13874242d;p=openstack-build%2Fneutron-build.git

Move metadata proxy shared options to neutron.conf

This change moves metadata proxy options shared between dhcp and l3
agents to neutron.conf. This change prepares follow-up changes allowing
to run metadata proxy with nobody user/group

Change-Id: I1828e322791b8a697765cad2f12857e3d6deae68
Related-bug: #1427228
---

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index ea13ba6c0..e259ad86a 100644
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -75,17 +75,6 @@
 # Use broadcast in DHCP replies
 # dhcp_broadcast_reply = False
 
-# User (uid or name) running metadata proxy after its initialization
-# (if empty: dhcp agent effective user)
-# metadata_proxy_user =
-
-# Group (gid or name) running metadata proxy after its initialization
-# (if empty: dhcp agent effective group)
-# metadata_proxy_group =
-
-# Location of Metadata Proxy UNIX domain socket
-# metadata_proxy_socket = $state_path/metadata_proxy
-
 # dhcp_delete_namespaces, which is false by default, can be set to True if
 # namespaces can be deleted cleanly on the host running the dhcp agent.
 # Do not enable this until you understand the problem with the Linux iproute
diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini
index eca07f0f3..2c4b7275f 100644
--- a/etc/l3_agent.ini
+++ b/etc/l3_agent.ini
@@ -48,14 +48,6 @@
 # TCP Port used by Neutron metadata server
 # metadata_port = 9697
 
-# User (uid or name) running metadata proxy after its initialization
-# (if empty: L3 agent effective user)
-# metadata_proxy_user =
-
-# Group (gid or name) running metadata proxy after its initialization
-# (if empty: L3 agent effective group)
-# metadata_proxy_group =
-
 # Send this many gratuitous ARPs for HA setup. Set it below or equal to 0
 # to disable this feature.
 # send_arp_for_ha = 3
@@ -74,9 +66,6 @@
 # Iptables mangle mark used to mark metadata valid requests
 # metadata_access_mark = 0x1
 
-# Location of Metadata Proxy UNIX domain socket
-# metadata_proxy_socket = $state_path/metadata_proxy
-
 # router_delete_namespaces, which is false by default, can be set to True if
 # namespaces can be deleted cleanly on the host running the L3 agent.
 # Do not enable this until you understand the problem with the Linux iproute
diff --git a/etc/neutron.conf b/etc/neutron.conf
index 95d2e5561..6374417f7 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -224,6 +224,19 @@ lock_path = $state_path/lock
 # l3_ha_net_cidr = 169.254.192.0/18
 # =========== end of items for l3 extension =======
 
+# =========== items for metadata proxy configuration ==============
+# User (uid or name) running metadata proxy after its initialization
+# (if empty: agent effective user)
+# metadata_proxy_user =
+
+# Group (gid or name) running metadata proxy after its initialization
+# (if empty: agent effective group)
+# metadata_proxy_group =
+
+# Location of Metadata Proxy UNIX domain socket
+# metadata_proxy_socket = $state_path/metadata_proxy
+# =========== end of items for metadata proxy configuration ==============
+
 # ========== items for VLAN trunking networks ==========
 # Setting this flag to True will allow plugins that support it to
 # create VLAN transparent networks. This flag has no effect for