openstack/neutron
Code Issues Proposed changes

Merge "Move metadata proxy shared options to neutron.conf"

Browse Source
This commit is contained in:
Jenkins 2015-03-25 15:15:09 +00:00 committed by Gerrit Code Review
commit 13c4df8e8b
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/dhcp_agent.ini
View File

@ -77,17 +77,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

11
etc/l3_agent.ini
View File

@ -50,14 +50,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
@ -76,9 +68,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

13
etc/neutron.conf
View File

@ -230,6 +230,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