From 216a95499662c965ab76ea69af42e63e8dd28043 Mon Sep 17 00:00:00 2001 From: Egon Rijpkema Date: Thu, 19 Jul 2018 10:32:01 +0200 Subject: [PATCH] Revert "changed vxlan settings neutron-controller nova-compute" This reverts commit 7ecc7154a57ded1cd1161d249499317c2f6c2ea6. --- neutron_controller/write_conf.sh | 11 +++++++++++ nova_compute/write_conf.sh | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/neutron_controller/write_conf.sh b/neutron_controller/write_conf.sh index 7a16302..153ada7 100755 --- a/neutron_controller/write_conf.sh +++ b/neutron_controller/write_conf.sh @@ -50,10 +50,20 @@ cat << EOF > /etc/neutron/plugins/ml2/ml2_conf.ini type_drivers = flat,vlan,vxlan tenant_network_types = vxlan mechanism_drivers = linuxbridge,l2population +extension_drivers = port_security + +[ml2_type_vlan] +network_vlan_ranges = provider + +[ml2_type_flat] +flat_networks = provider [ml2_type_vxlan] vni_ranges = 1:1000 +[securitygroup] +enable_ipset = true + EOF cat << EOF > /etc/neutron/metadata_agent.ini @@ -76,6 +86,7 @@ l2_population = True local_ip = $OVERLAY_IP [securitygroup] +enable_security_group = true firewall_driver = iptables EOF diff --git a/nova_compute/write_conf.sh b/nova_compute/write_conf.sh index 1103cee..c7f9189 100755 --- a/nova_compute/write_conf.sh +++ b/nova_compute/write_conf.sh @@ -223,6 +223,15 @@ password = $NOVA_PASSWORD EOF + +cat << EOF > /etc/neutron/l3_agent.ini + +[DEFAULT] +interface_driver = linuxbridge +external_network_bridge = + +EOF + cat << EOF > /etc/neutron/dhcp_agent.ini [DEFAULT] @@ -246,10 +255,20 @@ cat << EOF > /etc/neutron/plugins/ml2/ml2_conf.ini type_drivers = flat,vlan,vxlan tenant_network_types = vxlan mechanism_drivers = linuxbridge,l2population +extension_drivers = port_security + +[ml2_type_vlan] +network_vlan_ranges = provider + +[ml2_type_flat] +flat_networks = provider [ml2_type_vxlan] vni_ranges = 1:100 +[securitygroup] +enable_ipset = true + EOF cat << EOF > /etc/neutron/plugins/ml2/linuxbridge_agent.ini