From 1bb7f148a09b261ea0786cbc6a97abd9a629a36c Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 13 May 2016 12:40:38 -0600 Subject: modified to download both trusty and xenial images. Change-Id: I9d6897b39d45f037e604d8416bb73932dd9538b5 Signed-off-by: Narinder Gupta --- ci/maas/orange/pod2/lxc-add-more-interfaces | 43 ----------------------------- 1 file changed, 43 deletions(-) delete mode 100755 ci/maas/orange/pod2/lxc-add-more-interfaces (limited to 'ci/maas/orange/pod2/lxc-add-more-interfaces') diff --git a/ci/maas/orange/pod2/lxc-add-more-interfaces b/ci/maas/orange/pod2/lxc-add-more-interfaces deleted file mode 100755 index a22901a0..00000000 --- a/ci/maas/orange/pod2/lxc-add-more-interfaces +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -set -e -set -u - -cat <> "$LXC_CONFIG_FILE" - -## added by juju charm -lxc.network.type = veth -lxc.network.flags = up -lxc.network.link = brData -lxc.network.name = eth1 -lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//') -EOF - -USERDATA="$LXC_ROOTFS_PATH/var/lib/cloud/seed/nocloud-net/user-data" - -additional_interfaces=" -- | - cat <> /etc/network/interfaces.d/additional-interfaces - ## added by juju charm - ## those interfaces will be brought up by the upstart job as /etc/init/additional-interfaces.conf - ## LP: #1483932 - auto eth1 - iface eth1 inet dhcp - EOF -- machine_agent=\$(hostname | sed -e 's/^juju-/jujud-/') -- | - cat < /etc/init/additional-interfaces.conf - ## added by juju charm - ## LP: #1483932 - start on started \${machine_agent} - - script - sleep 10 - ifup -a -i /etc/network/interfaces.d/additional-interfaces - end script - EOF -" -additional_interfaces=$(echo "$additional_interfaces" | sed -e 's/$/\\n/' | tr -d '\n') - -sed -i.orig -e "s@^runcmd:@\0$additional_interfaces@" \ - "$USERDATA" -- cgit 1.2.3-korg