diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2015-04-10 13:10:30 +0100 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-15 10:42:46 +0100 |
commit | 7c362ed24f186d94dd1b489c793b65308975fda5 (patch) | |
tree | dca3cd42c331726293bbac4d6a2f211002ab75cf /openstack/usr/share | |
parent | 13aa33964469d7fd7379abf641ab53a090cecb9b (diff) | |
download | definitions-7c362ed24f186d94dd1b489c793b65308975fda5.tar.gz |
openstack: Strip out complicated network config
For onenode purposes we only need one bridge, and for multi-node we need
more configuration that we haven't yet defined.
Plus, because we have Physnet1:br-eth1 in the config we end up making a
loop inside our machines, which in some circumstances can cause a loop
in the external network, which is a BAD THING!
Change-Id: Ia765d48fd4e24fa73325ab992bbad8d3c217d111
Diffstat (limited to 'openstack/usr/share')
-rw-r--r-- | openstack/usr/share/openstack/network.yml | 64 | ||||
-rw-r--r-- | openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini | 2 |
2 files changed, 5 insertions, 61 deletions
diff --git a/openstack/usr/share/openstack/network.yml b/openstack/usr/share/openstack/network.yml index 955a617b..c8ab03f7 100644 --- a/openstack/usr/share/openstack/network.yml +++ b/openstack/usr/share/openstack/network.yml @@ -4,9 +4,6 @@ - /etc/openstack/network.conf tasks: # Create the bridges to use the External network mapped -# This configuration is for 1 node and it was taken from: -# https://fosskb.wordpress.com/2014/10/18/openstack-juno-on-ubuntu-14-10/ -# and https://fosskb.wordpress.com/2014/06/10/managing-openstack-internaldataexternal-network-in-one-interface/ # Count number of network interfaces (interfaces starting with 'e') - shell: ls /sys/class/net | grep ^e.* | wc -l @@ -44,80 +41,27 @@ with_items: - "{{ ETH_INTERFACE }}" - - name: Disable dhcp on all the internal interfaces template: src: /usr/share/openstack/extras/00-disable-device.network dest: /run/systemd/network/00-disable-{{ item }}-config.network with_items: - - br-eth1 - - br-ex - - eth1-br-proxy - - proxy-br-eth1 - - proxy-br-ex - ovs-system -#ovs-vsctl \ -# -- add-br br-eth0 \ -# -- add-port br-eth0 $eth_dev \ -# -- set bridge br-eth0 other-config:hwaddr=$eth_mac -# - - - openvswitch_bridge: - bridge: br-eth0 + bridge: br-ex state: present - openvswitch_port: - bridge: br-eth0 + bridge: br-ex port: "{{ ETH_INTERFACE }}" state: present - - shell: ovs-vsctl set bridge br-eth0 other-config:hwaddr={{ ETH_MAC_ADDRESS }} + - shell: ovs-vsctl set bridge br-ex other-config:hwaddr={{ ETH_MAC_ADDRESS }} - name: Enable dhcp on the Open vSwitch device that replaces our external interface template: src: /usr/share/openstack/extras/10-device-dhcp.network dest: /run/systemd/network/10-{{ item }}-dhcp.network with_items: - - br-eth0 - -#ovs-vsctl \ -# -- add-br br-eth1 \ -# -- add-port br-eth1 eth1-br-proxy \ -# -- set interface eth1-br-proxy type=patch options:peer=proxy-br-eth1 \ -# -- add-port br-eth0 proxy-br-eth1 \ -# -- set interface proxy-br-eth1 type=patch options:peer=eth1-br-proxy \ -# -- add-br br-ex \ -# -- add-port br-ex ex-br-proxy \ -# -- set interface ex-br-proxy type=patch options:peer=proxy-br-ex \ -# -- add-port br-eth0 proxy-br-ex \ -# -- set interface proxy-br-ex type=patch options:peer=ex-br-proxy - - - - openvswitch_bridge: - bridge: br-eth1 - state: present - - openvswitch_port: - bridge: br-eth1 - port: eth1-br-proxy - state: present - - shell: ovs-vsctl set interface eth1-br-proxy type=patch options:peer=proxy-br-eth1 - - openvswitch_port: - bridge: br-eth0 - port: proxy-br-eth1 - state: present - - shell: ovs-vsctl set interface proxy-br-eth1 type=patch options:peer=eth1-br-proxy - - openvswitch_bridge: - bridge: br-ex - state: present - - openvswitch_port: - bridge: br-ex - port: ex-br-proxy - state: present - - shell: ovs-vsctl set interface ex-br-proxy type=patch options:peer=proxy-br-ex - - openvswitch_port: - bridge: br-eth0 - port: proxy-br-ex - state: present - - shell: ovs-vsctl set interface proxy-br-ex type=patch options:peer=ex-br-proxy + - br-ex diff --git a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini index 78d938b9..8880471a 100644 --- a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini +++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini @@ -79,7 +79,7 @@ enable_ipset = True [ovs] local_ip = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }} enable_tunneling = True -bridge_mappings=External:br-ex,Physnet1:br-eth1 +bridge_mappings=External:br-ex [agent] tunnel_types = gre |