summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-01 17:18:12 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-08 18:29:30 +0100
commit4c2a47421587179737f1137cbf22c3a3adc09111 (patch)
treeb2b8aea49f34f9e8fe200a4479f0f2d2317a08ae
parentffbc364ae4fed1117d5f4e8b12c16c4d8c1b3a24 (diff)
downloaddefinitions-4c2a47421587179737f1137cbf22c3a3adc09111.tar.gz
32 patch comments
-rw-r--r--openstack/usr/share/openstack/neutron/dhcp_agent.ini6
-rw-r--r--openstack/usr/share/openstack/neutron/l3_agent.ini8
-rw-r--r--openstack/usr/share/openstack/neutron/metadata_agent.ini8
-rw-r--r--openstack/usr/share/openstack/neutron/neutron.conf9
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini2
5 files changed, 20 insertions, 13 deletions
diff --git a/openstack/usr/share/openstack/neutron/dhcp_agent.ini b/openstack/usr/share/openstack/neutron/dhcp_agent.ini
index de177b6f..7d711bf6 100644
--- a/openstack/usr/share/openstack/neutron/dhcp_agent.ini
+++ b/openstack/usr/share/openstack/neutron/dhcp_agent.ini
@@ -1,7 +1,9 @@
[DEFAULT]
# Show debugging output in log (sets DEBUG log level output)
-debug = True
-verbose = True
+#debug = False
+#verbose = False
+
+use_syslog = True
# The DHCP agent will resync its state with Neutron to recover from any
# transient notification or rpc errors. The interval is number of
diff --git a/openstack/usr/share/openstack/neutron/l3_agent.ini b/openstack/usr/share/openstack/neutron/l3_agent.ini
index e29c88c4..3186e238 100644
--- a/openstack/usr/share/openstack/neutron/l3_agent.ini
+++ b/openstack/usr/share/openstack/neutron/l3_agent.ini
@@ -1,8 +1,10 @@
[DEFAULT]
# Show debugging output in log (sets DEBUG log level output)
-debug = True
-verbose = True
-
+#debug = False
+#verbose = False
+
+use_syslog = True
+
# L3 requires that an interface driver be set. Choose the one that best
# matches your plugin.
# interface_driver =
diff --git a/openstack/usr/share/openstack/neutron/metadata_agent.ini b/openstack/usr/share/openstack/neutron/metadata_agent.ini
index 26ca9385..ccb163f3 100644
--- a/openstack/usr/share/openstack/neutron/metadata_agent.ini
+++ b/openstack/usr/share/openstack/neutron/metadata_agent.ini
@@ -1,8 +1,10 @@
[DEFAULT]
# Show debugging output in log (sets DEBUG log level output)
-debug = True
-verbose = True
-
+#debug = False
+#verbose = False
+
+use_syslog = True
+
# The Neutron user information for accessing the Neutron API.
auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
auth_region = regionOne
diff --git a/openstack/usr/share/openstack/neutron/neutron.conf b/openstack/usr/share/openstack/neutron/neutron.conf
index 4608e732..75d69c4c 100644
--- a/openstack/usr/share/openstack/neutron/neutron.conf
+++ b/openstack/usr/share/openstack/neutron/neutron.conf
@@ -1,6 +1,6 @@
[DEFAULT]
# Print more verbose output (set logging level to INFO instead of default WARNING level).
-verbose = True
+#verbose = False
# =========Start Global Config Option for Distributed L3 Router===============
# Setting the "router_distributed" flag to "True" will default to the creation
@@ -12,11 +12,11 @@ verbose = True
#
# ===========End Global Config Option for Distributed L3 Router===============
-neutron_metadata_proxy_shared_secret=openstack
+neutron_metadata_proxy_shared_secret={{ METADATA_PROXY_SHARED_SECRET }}
service_neutron_metadata_proxy=True
# Print debugging output (set logging level to DEBUG instead of default WARNING level).
-debug = True
+#debug = False
# Where to store Neutron state files. This directory must be writable by the
# user executing the agent.
@@ -35,7 +35,8 @@ lock_path = $state_path/lock
# (not user_stderr) and (not log_file) -> stdout
# publish_errors -> notification system
-# use_syslog = False
+use_syslog = True
+
# syslog_log_facility = LOG_USER
# use_stderr = True
diff --git a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
index 58e5fe21..78d938b9 100644
--- a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
@@ -77,7 +77,7 @@ enable_security_group = True
enable_ipset = True
[ovs]
-local_ip = onenode
+local_ip = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
enable_tunneling = True
bridge_mappings=External:br-ex,Physnet1:br-eth1