openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Fix reversed calico override vars

Browse Source 
calico-felix overrides being set for calico-dhcp-agent and vice
versa.

Change-Id: I7befae6268ca77adb462a3a06d1dcf59b277eea2
This commit is contained in:
Logan V 2016-11-14 21:34:24 -06:00
parent 898ea99687
commit 9fc9ffaede
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -277,7 +277,7 @@ neutron_services:
service_conf_path: /etc/calico service_conf_path: /etc/calico
service_conf: felix.cfg service_conf: felix.cfg
config_options: --config-file /etc/calico/felix.cfg config_options: --config-file /etc/calico/felix.cfg
config_overrides: "{{ neutron_calico_dhcp_agent_ini_overrides }}" config_overrides: "{{ neutron_calico_felix_ini_overrides }}"
config_type: "ini" config_type: "ini"
calico-dhcp-agent: calico-dhcp-agent:
group: neutron_calico_dhcp_agent group: neutron_calico_dhcp_agent
@ -285,7 +285,7 @@ neutron_services:
service_en: "{{ neutron_plugin_type == 'ml2.calico' }}" service_en: "{{ neutron_plugin_type == 'ml2.calico' }}"
service_rootwrap: rootwrap.d/dhcp.filters service_rootwrap: rootwrap.d/dhcp.filters
config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf" config_options: "--config-file {{ neutron_conf_dir }}/neutron.conf"
config_overrides: "{{ neutron_calico_felix_ini_overrides }}" config_overrides: "{{ neutron_calico_dhcp_agent_ini_overrides }}"
config_type: "ini" config_type: "ini"
## Neutron DHCP Agent ## Neutron DHCP Agent