Commit 3a2c25d6 authored by Jan Siersch's avatar Jan Siersch
Browse files

moved neutron from gre to vxlan (working)

fix: missing ovs and agent parameters in neutron.ini
fix: inconsistent nova conf
add: ovs bridge teardown during unstack
parent d055f842
[ml2]
type_drivers = flat,gre
tenant_network_types = gre
type_drivers = flat,vxlan
tenant_network_types = vxlan
mechanism_drivers = openvswitch
[ml2_type_flat]
......@@ -11,6 +11,8 @@ tunnel_id_ranges = 1:1000
[ml2_type_vlan]
[ml2_type_vxlan]
vni_ranges = 100:10000
vxlan_group =
[ml2_odl]
url = http://${SDNCONTROL_IP_CTRL}:8080/controller/nb/v2/neutron
......@@ -21,11 +23,13 @@ timeout = 10
[agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
tunnel_types = vxlan
[ovs]
local_ip = ${COMPUTENODE_IP_DATA}
enable_tunneling = true
tunnel_type = gre
tunnel_type = vxlan
tenant_network_type = vxlan
local_ip = ${COMPUTENODE_IP_DATA}
[odl]
controllers = ${SDNCONTROL_IP_CTRL}:6633:admin:admin
......@@ -36,4 +40,3 @@ tenant_network_type = vlan
enable_security_group = True
enable_ipset = True
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
......@@ -53,7 +53,7 @@ linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
firewall_driver = nova.virt.firewall.NoopFirewallDriver
# misc
iscsi_helper = tgtadm
iscsi_helper = lioadm
ec2_private_dns_show_ip = True
enabled_apis = ec2,osapi_compute,metadata
......
[ml2]
type_drivers = flat,gre
tenant_network_types = gre
type_drivers = flat,vxlan
tenant_network_types = vxlan
mechanism_drivers = openvswitch
[ml2_type_flat]
......@@ -11,6 +11,8 @@ tunnel_id_ranges = 1:1000
[ml2_type_vlan]
[ml2_type_vxlan]
vni_ranges = 100:10000
vxlan_group =
[ml2_odl]
url = http://${SDNCONTROL_IP_CTRL}:8080/controller/nb/v2/neutron
......@@ -21,10 +23,12 @@ timeout = 10
[agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
tunnel_types = vxlan
[ovs]
enable_tunneling = true
tunnel_type = gre
tunnel_type = vxlan
tenant_network_type = vxlan
[odl]
controllers = ${SDNCONTROL_IP_CTRL}:6633:admin:admin
......@@ -35,4 +39,3 @@ tenant_network_type = vlan
enable_security_group = True
enable_ipset = True
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
......@@ -53,7 +53,7 @@ linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
firewall_driver = nova.virt.firewall.NoopFirewallDriver
# misc
iscsi_helper = tgtadm
iscsi_helper = lioadm
ec2_private_dns_show_ip = True
enabled_apis = ec2,osapi_compute,metadata
......
[ml2]
type_drivers = flat,gre
tenant_network_types = gre
type_drivers = flat,vxlan
tenant_network_types = vxlan
mechanism_drivers = openvswitch
[ml2_type_flat]
......@@ -12,6 +12,8 @@ tunnel_id_ranges = 1:1000
[ml2_type_vlan]
[ml2_type_vxlan]
vni_ranges = 100:10000
vxlan_group =
[ml2_odl]
url = http://${SDNCONTROL_IP_CTRL}:8080/controller/nb/v2/neutron
......@@ -22,11 +24,13 @@ timeout = 10
[agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
tunnel_types = vxlan
[ovs]
local_ip = ${NETWORKNODE_IP_DATA}
enable_tunneling = true
tunnel_type = gre
tunnel_type = vxlan
tenant_network_type = vxlan
local_ip = ${NETWORKNODE_IP_DATA}
bridge_mappings = external:br-ex
[odl]
......@@ -38,4 +42,3 @@ tenant_network_type = vlan
enable_security_group = True
enable_ipset = True
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
......@@ -58,6 +58,11 @@ fi
if $doStop; then
# stop in reverse order
for i in $(echo ${arr[@]} | tr " " "\n" | tac - | tr "\n" " "); do
# bridges br-int and br-tun are auto-created on start, but not auto-deleted
if [[ "$i" == "openvswitch.service" ]] && systemctl is-active "openvswitch.service" > /dev/null; then
ovs-vsctl --if-exists del-br br-tun
ovs-vsctl --if-exists del-br br-int
fi
systemctl stop "$i";
done
fi
......
......@@ -58,6 +58,11 @@ fi
if $doStop; then
# stop in reverse order
for i in $(echo ${arr[@]} | tr " " "\n" | tac - | tr "\n" " "); do
# bridges br-int and br-tun are auto-created on start, but not auto-deleted
if [[ "$i" == "openvswitch.service" ]] && systemctl is-active "openvswitch.service" > /dev/null; then
ovs-vsctl --if-exists del-br br-tun
ovs-vsctl --if-exists del-br br-int
fi
systemctl stop "$i";
done
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment