summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-29 15:52:33 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-29 15:52:33 (GMT)
commite843a9ee85429d58840100fcee0e81087e83cc53 (patch)
treec0d6509662358fec9a4357652d2b36d53df6a162
parentb3219d44c3166f4467a4da5e9a28e28a521602d2 (diff)
downloaddefinitions-e843a9ee85429d58840100fcee0e81087e83cc53.tar.gz
Create veth links on network configuration and will work always
-rw-r--r--openstack/usr/share/openstack/create_openvswitch_veth_pairs2
-rw-r--r--openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node3
2 files changed, 3 insertions, 2 deletions
diff --git a/openstack/usr/share/openstack/create_openvswitch_veth_pairs b/openstack/usr/share/openstack/create_openvswitch_veth_pairs
index 1e21ea6..632efd4 100644
--- a/openstack/usr/share/openstack/create_openvswitch_veth_pairs
+++ b/openstack/usr/share/openstack/create_openvswitch_veth_pairs
@@ -24,8 +24,6 @@ eth_ip="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet
# Create the veth pairs between bridges (configuration one node)
ifconfig br-eth0 $eth_ip up
ip link set br-eth0 promisc on
-ip link add proxy-br-eth1 type veth peer name eth1-br-proxy
-ip link add proxy-br-ex type veth peer name ex-br-proxy
ip link set eth1-br-proxy up promisc on
ip link set ex-br-proxy up promisc on
ip link set proxy-br-eth1 up promisc on
diff --git a/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node b/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
index a88bc0d..c2ccbd8 100644
--- a/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
+++ b/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
@@ -21,6 +21,9 @@ set -xe
eth_dev="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet ([^/]+)/@) { print "$iface $1\n"; } $_=undef;' | grep "^e" | head -1 | awk '{ print $1 } ')"
eth_ip="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet ([^/]+)/@) { print "$iface $1\n"; } $_=undef;' | grep "^e" | head -1 | awk '{ print $2 } ')"
+ip link add proxy-br-eth1 type veth peer name eth1-br-proxy
+ip link add proxy-br-ex type veth peer name ex-br-proxy
+
if [ -f /var/openstack/openvswitch-one-node-setup ]; then
exit 0
fi