openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Remove static log-file parameter from init"

Browse Source
This commit is contained in:
Jenkins 2016-07-12 07:10:08 +00:00 committed by Gerrit Code Review
commit f8b0b0e973
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
defaults/main.yml
View File

@ -129,7 +129,7 @@ neutron_services:
service_en: "{{ neutron_dhcp | bool }}" service_en: "{{ neutron_dhcp | bool }}"
service_conf: dhcp_agent.ini service_conf: dhcp_agent.ini
service_rootwrap: rootwrap.d/dhcp.filters service_rootwrap: rootwrap.d/dhcp.filters
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/neutron-dhcp-agent.log
config_overrides: "{{ neutron_dhcp_agent_ini_overrides }}" config_overrides: "{{ neutron_dhcp_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-openvswitch-agent: neutron-openvswitch-agent:
@ -138,7 +138,7 @@ neutron_services:
service_en: "{{ neutron_plugin_type == 'ml2.ovs' }}" service_en: "{{ neutron_plugin_type == 'ml2.ovs' }}"
service_conf: plugins/ml2/openvswitch_agent.ini service_conf: plugins/ml2/openvswitch_agent.ini
service_rootwrap: rootwrap.d/openvswitch-plugin.filters service_rootwrap: rootwrap.d/openvswitch-plugin.filters
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --log-file=/var/log/neutron/neutron-openvswitch-agent.log
config_overrides: "{{ neutron_openvswitch_agent_ini_overrides }}" config_overrides: "{{ neutron_openvswitch_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-linuxbridge-agent: neutron-linuxbridge-agent:
@ -147,7 +147,7 @@ neutron_services:
service_en: "{{ neutron_plugin_type == 'ml2.lxb' }}" service_en: "{{ neutron_plugin_type == 'ml2.lxb' }}"
service_conf: plugins/ml2/linuxbridge_agent.ini service_conf: plugins/ml2/linuxbridge_agent.ini
service_rootwrap: rootwrap.d/linuxbridge-plugin.filters service_rootwrap: rootwrap.d/linuxbridge-plugin.filters
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/plugins/ml2/linuxbridge_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/plugins/ml2/linuxbridge_agent.ini --log-file=/var/log/neutron/neutron-linuxbridge-agent.log
config_overrides: "{{ neutron_linuxbridge_agent_ini_overrides }}" config_overrides: "{{ neutron_linuxbridge_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-metadata-agent: neutron-metadata-agent:
@ -155,7 +155,7 @@ neutron_services:
service_name: neutron-metadata-agent service_name: neutron-metadata-agent
service_en: "{{ neutron_metadata | bool }}" service_en: "{{ neutron_metadata | bool }}"
service_conf: metadata_agent.ini service_conf: metadata_agent.ini
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini --log-file=/var/log/neutron/neutron-metadata-agent.log
config_overrides: "{{ neutron_metadata_agent_ini_overrides }}" config_overrides: "{{ neutron_metadata_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-metering-agent: neutron-metering-agent:
@ -163,7 +163,7 @@ neutron_services:
service_name: neutron-metering-agent service_name: neutron-metering-agent
service_en: "{{ neutron_metering | bool }}" service_en: "{{ neutron_metering | bool }}"
service_conf: metering_agent.ini service_conf: metering_agent.ini
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metering_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metering_agent.ini --log-file=/var/log/neutron/neutron-metering-agent.log
config_overrides: "{{ neutron_metering_agent_ini_overrides }}" config_overrides: "{{ neutron_metering_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-l3-agent: neutron-l3-agent:
@ -172,7 +172,7 @@ neutron_services:
service_en: "{{ neutron_l3 | bool }}" service_en: "{{ neutron_l3 | bool }}"
service_conf: l3_agent.ini service_conf: l3_agent.ini
service_rootwrap: rootwrap.d/l3.filters service_rootwrap: rootwrap.d/l3.filters
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --log-file=/var/log/neutron/neutron-l3-agent.log
config_overrides: "{{ neutron_l3_agent_ini_overrides }}" config_overrides: "{{ neutron_l3_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-lbaas-agent: neutron-lbaas-agent:
@ -181,7 +181,7 @@ neutron_services:
service_en: "{{ neutron_lbaas | bool }}" service_en: "{{ neutron_lbaas | bool }}"
service_conf: lbaas_agent.ini service_conf: lbaas_agent.ini
service_rootwrap: rootwrap.d/lbaas-haproxy.filters service_rootwrap: rootwrap.d/lbaas-haproxy.filters
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini --log-file=/var/log/neutron/neutron-lbaas-agent.log
config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}" config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-lbaasv2-agent: neutron-lbaasv2-agent:
@ -190,7 +190,7 @@ neutron_services:
service_en: "{{ neutron_lbaasv2 | bool }}" service_en: "{{ neutron_lbaasv2 | bool }}"
service_conf: lbaas_agent.ini service_conf: lbaas_agent.ini
service_rootwrap: rootwrap.d/lbaas-haproxy.filters service_rootwrap: rootwrap.d/lbaas-haproxy.filters
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini --log-file=/var/log/neutron/neutron-lbaasv2-agent.log
config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}" config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-vpnaas-agent: neutron-vpnaas-agent:
@ -199,14 +199,14 @@ neutron_services:
service_en: "{{ neutron_vpnaas | bool }}" service_en: "{{ neutron_vpnaas | bool }}"
service_conf: vpnaas_agent.ini service_conf: vpnaas_agent.ini
service_rootwrap: rootwrap.d/vpnaas.filters service_rootwrap: rootwrap.d/vpnaas.filters
config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpnaas_agent.ini config_options: --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpnaas_agent.ini --log-file=/var/log/neutron/neutron-vpn-agent.log
config_overrides: "{{ neutron_vpnaas_agent_ini_overrides }}" config_overrides: "{{ neutron_vpnaas_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
neutron-server: neutron-server:
group: neutron_server group: neutron_server
service_name: neutron-server service_name: neutron-server
service_en: True service_en: True
config_options: "--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/{{ neutron_plugins[neutron_plugin_type].plugin_ini }}" config_options: "--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/{{ neutron_plugins[neutron_plugin_type].plugin_ini }} --log-file=/var/log/neutron/neutron-server.log"
## Neutron DHCP Agent ## Neutron DHCP Agent
neutron_dhcp: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% else %}False{% endif %}" neutron_dhcp: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% else %}False{% endif %}"

4
templates/neutron-systemd-init.j2
View File

@ -11,9 +11,9 @@ User={{ system_user }}
Group={{ system_group }} Group={{ system_group }}
{% if program_override is defined %} {% if program_override is defined %}
ExecStart={{ program_override }} {{ program_config_options|default('') }} --log-file=/var/log/neutron/{{ program_name }}.log ExecStart={{ program_override }} {{ program_config_options|default('') }}
{% else %} {% else %}
ExecStart={{ neutron_bin }}/{{ program_name }} {{ program_config_options|default('') }} --log-file=/var/log/neutron/{{ program_name }}.log ExecStart={{ neutron_bin }}/{{ program_name }} {{ program_config_options|default('') }}
{% endif %} {% endif %}
# Give a reasonable amount of time for the server to start up/shut down # Give a reasonable amount of time for the server to start up/shut down

3
templates/neutron-upstart-init.j2
View File

@ -39,5 +39,4 @@ exec start-stop-daemon --start \
--make-pidfile \ --make-pidfile \
--pidfile /var/run/{{ program_name }}/{{ program_name }}.pid \ --pidfile /var/run/{{ program_name }}/{{ program_name }}.pid \
--exec "{{ program_override|default('$RUNBIN') }}" \ --exec "{{ program_override|default('$RUNBIN') }}" \
-- {{ program_config_options|default('') }} \ -- {{ program_config_options|default('') }}
--log-file=/var/log/neutron/{{ program_name }}.log