From 5483199b2ad669575552c3a85790327a7edb2e78 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Mon, 25 Feb 2013 13:31:38 +0000 Subject: [PATCH] Add default state_path to quantum.conf Fixes bug 1132793 Change-Id: I7af0b773105443672ede30b352d3b207f1ae7c5d --- etc/dhcp_agent.ini | 4 ---- etc/l3_agent.ini | 4 ---- etc/metadata_agent.ini | 4 ---- etc/quantum.conf | 4 ++++ 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini index 2e9e06e4b19..96253124754 100644 --- a/etc/dhcp_agent.ini +++ b/etc/dhcp_agent.ini @@ -2,10 +2,6 @@ # Show debugging output in log (sets DEBUG log level output) # debug = true -# Where to store dnsmasq state files. This directory must be writable by the -# user executing the agent. -# state_path = /var/lib/quantum - # The DHCP agent will resync its state with Quantum to recover from any # transient notification or rpc errors. The interval is number of # seconds between attempts. diff --git a/etc/l3_agent.ini b/etc/l3_agent.ini index 2021b17b6f7..133576c3f37 100644 --- a/etc/l3_agent.ini +++ b/etc/l3_agent.ini @@ -19,10 +19,6 @@ interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver # If use_namespaces is set as False then the agent can only configure one router. -# Where to store Quantum state files. This directory must be writable by the -# user executing the agent. -# state_path = /var/lib/quantum - # This is done by setting the specific router_id. # router_id = diff --git a/etc/metadata_agent.ini b/etc/metadata_agent.ini index e7630911d31..2a4e1ac55e2 100644 --- a/etc/metadata_agent.ini +++ b/etc/metadata_agent.ini @@ -9,10 +9,6 @@ admin_tenant_name = %SERVICE_TENANT_NAME% admin_user = %SERVICE_USER% admin_password = %SERVICE_PASSWORD% -# Where to store metadata state files. This directory must be writable by the -# user executing the agent. -# state_path = /var/lib/quantum - # IP address used by Nova metadata server # nova_metadata_ip = 127.0.0.1 diff --git a/etc/quantum.conf b/etc/quantum.conf index b2700978b48..192a2ac7ce4 100644 --- a/etc/quantum.conf +++ b/etc/quantum.conf @@ -5,6 +5,10 @@ # debug = False # verbose = False +# Where to store Quantum state files. This directory must be writable by the +# user executing the agent. +# state_path = /var/lib/quantum + # log_format = %(asctime)s %(levelname)8s [%(name)s] %(message)s # log_date_format = %Y-%m-%d %H:%M:%S