From 4016267a0af76705980b197d665881653e4bbbb7 Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Wed, 26 Mar 2014 11:06:19 +0000 Subject: [PATCH] [hopem] removed extraneous use_syslog from .ini files since neutron.conf & quantum.conf should suffice --- hooks/quantum_utils.py | 24 ++++++++---------------- templates/folsom/dhcp_agent.ini | 1 - templates/folsom/l3_agent.ini | 1 - templates/folsom/metadata_agent.ini | 3 +-- templates/folsom/ovs_quantum_plugin.ini | 2 -- templates/havana/dhcp_agent.ini | 1 - templates/havana/l3_agent.ini | 1 - templates/havana/metadata_agent.ini | 1 - templates/havana/ovs_neutron_plugin.ini | 2 -- 9 files changed, 9 insertions(+), 27 deletions(-) diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py index 2efd9445..7e500c0f 100644 --- a/hooks/quantum_utils.py +++ b/hooks/quantum_utils.py @@ -161,14 +161,12 @@ NOVA_CONFIG_FILES = { QUANTUM_SHARED_CONFIG_FILES = { QUANTUM_DHCP_AGENT_CONF: { - 'hook_contexts': [QuantumGatewayContext(), - SyslogContext()], + 'hook_contexts': [QuantumGatewayContext()], 'services': ['quantum-dhcp-agent'] }, QUANTUM_METADATA_AGENT_CONF: { 'hook_contexts': [NetworkServiceContext(), - QuantumGatewayContext(), - SyslogContext()], + QuantumGatewayContext()], 'services': ['quantum-metadata-agent'] }, } @@ -176,8 +174,7 @@ QUANTUM_SHARED_CONFIG_FILES.update(NOVA_CONFIG_FILES) NEUTRON_SHARED_CONFIG_FILES = { NEUTRON_DHCP_AGENT_CONF: { - 'hook_contexts': [QuantumGatewayContext(), - SyslogContext()], + 'hook_contexts': [QuantumGatewayContext()], 'services': ['neutron-dhcp-agent'] }, NEUTRON_DNSMASQ_CONF: { @@ -186,8 +183,7 @@ NEUTRON_SHARED_CONFIG_FILES = { }, NEUTRON_METADATA_AGENT_CONF: { 'hook_contexts': [NetworkServiceContext(), - QuantumGatewayContext(), - SyslogContext()], + QuantumGatewayContext()], 'services': ['neutron-metadata-agent'] }, } @@ -204,15 +200,13 @@ QUANTUM_OVS_CONFIG_FILES = { 'quantum-plugin-openvswitch-agent'] }, QUANTUM_L3_AGENT_CONF: { - 'hook_contexts': [NetworkServiceContext(), - SyslogContext()], + 'hook_contexts': [NetworkServiceContext()], 'services': ['quantum-l3-agent'] }, # TODO: Check to see if this is actually required QUANTUM_OVS_PLUGIN_CONF: { 'hook_contexts': [QuantumSharedDBContext(), - QuantumGatewayContext(), - SyslogContext()], + QuantumGatewayContext()], 'services': ['quantum-plugin-openvswitch-agent'] }, EXT_PORT_CONF: { @@ -234,15 +228,13 @@ NEUTRON_OVS_CONFIG_FILES = { }, NEUTRON_L3_AGENT_CONF: { 'hook_contexts': [NetworkServiceContext(), - L3AgentContext(), - SyslogContext()], + L3AgentContext()], 'services': ['neutron-l3-agent'] }, # TODO: Check to see if this is actually required NEUTRON_OVS_PLUGIN_CONF: { 'hook_contexts': [QuantumSharedDBContext(), - QuantumGatewayContext(), - SyslogContext()], + QuantumGatewayContext()], 'services': ['neutron-plugin-openvswitch-agent'] }, EXT_PORT_CONF: { diff --git a/templates/folsom/dhcp_agent.ini b/templates/folsom/dhcp_agent.ini index 2995a1c0..62672f37 100644 --- a/templates/folsom/dhcp_agent.ini +++ b/templates/folsom/dhcp_agent.ini @@ -3,7 +3,6 @@ state_path = /var/lib/quantum interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver dhcp_driver = quantum.agent.linux.dhcp.Dnsmasq root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf -use_syslog = {{ use_syslog }} {% if plugin == 'nvp' %} ovs_use_veth = True enable_metadata_network = True diff --git a/templates/folsom/l3_agent.ini b/templates/folsom/l3_agent.ini index a60c110c..ff006324 100644 --- a/templates/folsom/l3_agent.ini +++ b/templates/folsom/l3_agent.ini @@ -6,4 +6,3 @@ admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} admin_password = {{ service_password }} root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf -use_syslog = {{ use_syslog }} diff --git a/templates/folsom/metadata_agent.ini b/templates/folsom/metadata_agent.ini index 7ea055a2..fae631ae 100644 --- a/templates/folsom/metadata_agent.ini +++ b/templates/folsom/metadata_agent.ini @@ -14,5 +14,4 @@ nova_metadata_port = 8775 # shared secret to prevent spoofing. You may select any string for a secret, # but it must match here and in the configuration used by the Nova Metadata # Server. NOTE: Nova uses a different key: quantum_metadata_proxy_shared_secret -metadata_proxy_shared_secret = {{ shared_secret }} -use_syslog = {{ use_syslog }} +metadata_proxy_shared_secret = {{ shared_secret }} \ No newline at end of file diff --git a/templates/folsom/ovs_quantum_plugin.ini b/templates/folsom/ovs_quantum_plugin.ini index bc86b51f..8d6d415a 100644 --- a/templates/folsom/ovs_quantum_plugin.ini +++ b/templates/folsom/ovs_quantum_plugin.ini @@ -1,5 +1,3 @@ -[DEFAULT] -use_syslog = {{ use_syslog }} [DATABASE] sql_connection = mysql://{{ quantum_user }}:{{ quantum_password }}@{{ database_host }}/{{ quantum_db }}?charset=utf8 reconnect_interval = 2 diff --git a/templates/havana/dhcp_agent.ini b/templates/havana/dhcp_agent.ini index 952c5b8f..6d76fac1 100644 --- a/templates/havana/dhcp_agent.ini +++ b/templates/havana/dhcp_agent.ini @@ -7,7 +7,6 @@ state_path = /var/lib/neutron interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf -use_syslog = {{ use_syslog }} ovs_use_veth = True {% if instance_mtu -%} dnsmasq_config_file = /etc/neutron/dnsmasq.conf diff --git a/templates/havana/l3_agent.ini b/templates/havana/l3_agent.ini index a7a19633..44a1970c 100644 --- a/templates/havana/l3_agent.ini +++ b/templates/havana/l3_agent.ini @@ -6,7 +6,6 @@ admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} admin_password = {{ service_password }} root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf -use_syslog = {{ use_syslog }} ovs_use_veth = True handle_internal_only_routers = {{ handle_internal_only_router }} {% if ext_net_id %} diff --git a/templates/havana/metadata_agent.ini b/templates/havana/metadata_agent.ini index 8174a9cf..ed549b1e 100644 --- a/templates/havana/metadata_agent.ini +++ b/templates/havana/metadata_agent.ini @@ -15,4 +15,3 @@ nova_metadata_port = 8775 # but it must match here and in the configuration used by the Nova Metadata # Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret metadata_proxy_shared_secret = {{ shared_secret }} -use_syslog = {{ use_syslog }} diff --git a/templates/havana/ovs_neutron_plugin.ini b/templates/havana/ovs_neutron_plugin.ini index 604e1ec8..95bf0a9a 100644 --- a/templates/havana/ovs_neutron_plugin.ini +++ b/templates/havana/ovs_neutron_plugin.ini @@ -1,5 +1,3 @@ -[DEFAULT] -use_syslog = {{ use_syslog }} [DATABASE] sql_connection = mysql://{{ quantum_user }}:{{ quantum_password }}@{{ database_host }}/{{ quantum_db }}?charset=utf8 reconnect_interval = 2