summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-03-20 09:47:40 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-23 22:58:56 (GMT)
commit2e1eaa26708210c6dedd7bde9d83354c6b008d7f (patch)
tree5bdc3e2cd567813d29ab0c39ed4f63e0223e2a4c
parent17c4826d0f2e0dc7cf56a9a010e6517aa2395d9a (diff)
downloaddefinitions-2e1eaa26708210c6dedd7bde9d83354c6b008d7f.tar.gz
openstack-net-config: Check whether we need to run before gethering network config
-rw-r--r--openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node8
1 files changed, 4 insertions, 4 deletions
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 f5f5444..abf1113 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
@@ -17,15 +17,15 @@
set -xe
+if [ -f /var/openstack/openvswitch-one-node-setup ]; then
+ exit 0
+fi
+
# Get the first ethernet driver and its ip
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 } ')"
eth_mac="$(ip link show $eth_dev | tr -s '[:space:]' '\n' | sed -n '/link\/ether/{n;p}')"
-if [ -f /var/openstack/openvswitch-one-node-setup ]; then
- exit 0
-fi
-
# 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/