summaryrefslogtreecommitdiffstats
path: root/ci/maas/att
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-05-13 12:40:38 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-05-13 12:42:42 -0600
commit1bb7f148a09b261ea0786cbc6a97abd9a629a36c (patch)
treed4c1761a9ac952ccd97643bdf4c03bb333e6e763 /ci/maas/att
parentb580a13a9d7bd0234ffc94f92ecedf859d50b17f (diff)
modified to download both trusty and xenial images.
Change-Id: I9d6897b39d45f037e604d8416bb73932dd9538b5 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/maas/att')
-rw-r--r--ci/maas/att/virpod1/interfaces.host12
-rw-r--r--ci/maas/att/virpod1/lxc-add-more-interfaces35
2 files changed, 0 insertions, 47 deletions
diff --git a/ci/maas/att/virpod1/interfaces.host b/ci/maas/att/virpod1/interfaces.host
deleted file mode 100644
index e837b2f1..00000000
--- a/ci/maas/att/virpod1/interfaces.host
+++ /dev/null
@@ -1,12 +0,0 @@
-#### original juju generated part ####
-auto lo
-
-# Primary interface (defining the default route)
-iface eth0 inet manual
-
-# Bridge to use for LXC/KVM containers
-auto juju-br0
-iface juju-br0 inet dhcp
- bridge_ports eth0
-######################################
-
diff --git a/ci/maas/att/virpod1/lxc-add-more-interfaces b/ci/maas/att/virpod1/lxc-add-more-interfaces
deleted file mode 100644
index d9512c31..00000000
--- a/ci/maas/att/virpod1/lxc-add-more-interfaces
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-
-cat <<EOF >> "$LXC_CONFIG_FILE"
-
-EOF
-
-USERDATA="$LXC_ROOTFS_PATH/var/lib/cloud/seed/nocloud-net/user-data"
-
-additional_interfaces="
-- |
- cat <<EOF >> /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
- EOF
-- machine_agent=\$(hostname | sed -e 's/^juju-/jujud-/')
-- |
- cat <<EOF > /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"