Get rid of tech debt and finally fix this once and for all

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2016-12-02 00:17:29 +00:00
parent 9893cd157d
commit 8fd8161321
2 changed files with 28 additions and 2 deletions

View file

@ -0,0 +1,26 @@
[ml2]
type_drivers = local,flat,gre
tenant_network_types = gre
mechanism_drivers = openvswitch
[ml2_type_flat]
[ml2_type_vlan]
[ml2_type_gre]
tunnel_id_ranges = 1:1000
[ml2_type_vxlan]
[securitygroup]
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
enable_security_group = True
[ovs]
local_ip = 172.24.0.3
tunnel_type = gre
tunnel_types = gre
enable_tunneling = True
[agent]
tunnel_types = gre

View file

@ -261,8 +261,8 @@
notify:
- restart neutron-openvswitch-agent
# WORKAROUND https://ask.openstack.org/en/question/28734/instance-failed-to-spawn-you-must-call-aug-init-first-to-initialize-augeas/
- ini_file: dest=/usr/lib/systemd/system/neutron-openvswitch-agent.service section=Service option=ExecStart value="/usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini --log-file /var/log/neutron/openvswitch-agent.log"
- name: Deploy Neutron plugin configuration
copy: src=neutron_plugin.ini dest=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
notify:
- restart neutron-openvswitch-agent