diff --git a/neutron_controller/write_conf.sh b/neutron_controller/write_conf.sh index 153ada7..7a16302 100755 --- a/neutron_controller/write_conf.sh +++ b/neutron_controller/write_conf.sh @@ -50,20 +50,10 @@ 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 @@ -86,7 +76,6 @@ 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 c7f9189..1103cee 100755 --- a/nova_compute/write_conf.sh +++ b/nova_compute/write_conf.sh @@ -223,15 +223,6 @@ 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] @@ -255,20 +246,10 @@ 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