diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-05-03 16:25:53 +0200 |
|---|---|---|
| committer | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-05-03 17:52:28 +0200 |
| commit | 9e47ddb9739bb3e6b2ca91615c71bcd94c954172 (patch) | |
| tree | f4c86ad5e05e77f5fdb5fc15a8071206548c11e5 /sdnvpn/lib/utils.py | |
| parent | 0d8f3bf930bdd945d34188fb591a6deb03a999c5 (diff) | |
Remove dependence inet
A new ubuntu image with quagga included was uploaded to
artifacts.opnfv.org/sdnvpn/
ubuntu-16.04-server-cloudimg-amd64-disk1.img
Change-Id: I7e48ebbc2b00b7e771f43b26303acc66c2c48457
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Diffstat (limited to 'sdnvpn/lib/utils.py')
| -rw-r--r-- | sdnvpn/lib/utils.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index 788e456..5eeb667 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -453,6 +453,8 @@ def wait_for_cloud_init(instance): # ubuntu images take a long time to start tries = 20 sleep_time = 30 + logger.info("Waiting for cloud init of instance: {}" + "".format(instance.name)) while tries > 0: instance_log = instance.get_console_output() if "Failed to run module" in instance_log: @@ -471,7 +473,8 @@ def wait_for_cloud_init(instance): ". Reason: %s", instance_log) success = False - + logger.info("Finished waiting for cloud init of instance {} result was {}" + "".format(instance.name, success)) return success @@ -487,14 +490,14 @@ def attach_instance_to_ext_br(instance, compute_node): # and virsh-attaching the instance to the linux-bridge bridge = "br-quagga" cmd = """ - set -xe - if ! brctl show |grep -q ^br-quagga;then - sudo brctl addbr {bridge} && - sudo ip link set {bridge} up && - sudo ip link add quagga-tap type veth peer name ovs-quagga-tap && - sudo ip link set dev ovs-quagga-tap up && - sudo ip link set dev quagga-tap up && - sudo ovs-vsctl add-port br-ex ovs-quagga-tap && + set -e + if ! sudo brctl show |grep -q ^{bridge};then + sudo brctl addbr {bridge} + sudo ip link set {bridge} up + sudo ip link add quagga-tap type veth peer name ovs-quagga-tap + sudo ip link set dev ovs-quagga-tap up + sudo ip link set dev quagga-tap up + sudo ovs-vsctl add-port br-ex ovs-quagga-tap sudo brctl addif {bridge} quagga-tap fi """ |