diff options
Diffstat (limited to 'ci/maas/default')
| -rw-r--r-- | ci/maas/default/deployment.yaml | 21 | ||||
| -rw-r--r-- | ci/maas/default/interfaces.host | 12 | ||||
| -rw-r--r-- | ci/maas/default/lxc-add-more-interfaces | 35 |
3 files changed, 19 insertions, 49 deletions
diff --git a/ci/maas/default/deployment.yaml b/ci/maas/default/deployment.yaml index 9207eebd..ad2e2a0c 100644 --- a/ci/maas/default/deployment.yaml +++ b/ci/maas/default/deployment.yaml @@ -30,15 +30,32 @@ demo-maas: arch: amd64 pool: default disk_size: 60G + release: trusty # Apt http proxy setting(s) - #apt_http_proxy: + apt_http_proxy: - # Package sources. These will be used on the MAAS controller. apt_sources: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + selections: + 1: + release: trusty + os: ubuntu + arches: amd64 + subarches: "*" + labels: daily + 2: + release: xenial + os: ubuntu + arches: amd64 + subarches: "*" + labels: daily + # Virsh power settings # Specifies the uri and keys to use for virsh power control of the # juju virtual machine. If the uri is omitted, the value for the diff --git a/ci/maas/default/interfaces.host b/ci/maas/default/interfaces.host deleted file mode 100644 index e837b2f1..00000000 --- a/ci/maas/default/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/default/lxc-add-more-interfaces b/ci/maas/default/lxc-add-more-interfaces deleted file mode 100644 index d9512c31..00000000 --- a/ci/maas/default/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" |