HPC/openstack_dockers
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "changed vxlan settings neutron-controller nova-compute"

Browse Source 
This reverts commit 7ecc7154a5.
This commit is contained in:
Egon Rijpkema 2018-07-19 10:32:01 +02:00
parent 7ecc7154a5
commit 216a954996
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron_controller/write_conf.sh
View File

@ -50,10 +50,20 @@ cat << EOF > /etc/neutron/plugins/ml2/ml2_conf.ini
type_drivers = flat,vlan,vxlan type_drivers = flat,vlan,vxlan
tenant_network_types = vxlan tenant_network_types = vxlan
mechanism_drivers = linuxbridge,l2population mechanism_drivers = linuxbridge,l2population
extension_drivers = port_security
[ml2_type_vlan]
network_vlan_ranges = provider
[ml2_type_flat]
flat_networks = provider
[ml2_type_vxlan] [ml2_type_vxlan]
vni_ranges = 1:1000 vni_ranges = 1:1000
[securitygroup]
enable_ipset = true
EOF EOF
cat << EOF > /etc/neutron/metadata_agent.ini cat << EOF > /etc/neutron/metadata_agent.ini
@ -76,6 +86,7 @@ l2_population = True
local_ip = $OVERLAY_IP local_ip = $OVERLAY_IP
[securitygroup] [securitygroup]
enable_security_group = true
firewall_driver = iptables firewall_driver = iptables
EOF EOF

19
nova_compute/write_conf.sh
View File

@ -223,6 +223,15 @@ password = $NOVA_PASSWORD
EOF EOF
cat << EOF > /etc/neutron/l3_agent.ini
[DEFAULT]
interface_driver = linuxbridge
external_network_bridge =
EOF
cat << EOF > /etc/neutron/dhcp_agent.ini cat << EOF > /etc/neutron/dhcp_agent.ini
[DEFAULT] [DEFAULT]
@ -246,10 +255,20 @@ cat << EOF > /etc/neutron/plugins/ml2/ml2_conf.ini
type_drivers = flat,vlan,vxlan type_drivers = flat,vlan,vxlan
tenant_network_types = vxlan tenant_network_types = vxlan
mechanism_drivers = linuxbridge,l2population mechanism_drivers = linuxbridge,l2population
extension_drivers = port_security
[ml2_type_vlan]
network_vlan_ranges = provider
[ml2_type_flat]
flat_networks = provider
[ml2_type_vxlan] [ml2_type_vxlan]
vni_ranges = 1:100 vni_ranges = 1:100
[securitygroup]
enable_ipset = true
EOF EOF
cat << EOF > /etc/neutron/plugins/ml2/linuxbridge_agent.ini cat << EOF > /etc/neutron/plugins/ml2/linuxbridge_agent.ini