From 1bb7f148a09b261ea0786cbc6a97abd9a629a36c Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
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 <narinder.gupta@canonical.com>
---
ci/maas/orange/pod1/deployment.yaml | 18 ++++++++++++
ci/maas/orange/pod2/compute-interfaces.host | 27 ------------------
ci/maas/orange/pod2/control-interfaces.host | 27 ------------------
ci/maas/orange/pod2/deployment.yaml | 18 ++++++++++++
ci/maas/orange/pod2/interfaces.host | 36 ------------------------
ci/maas/orange/pod2/lxc-add-more-interfaces | 43 -----------------------------
6 files changed, 36 insertions(+), 133 deletions(-)
delete mode 100644 ci/maas/orange/pod2/compute-interfaces.host
delete mode 100644 ci/maas/orange/pod2/control-interfaces.host
delete mode 100644 ci/maas/orange/pod2/interfaces.host
delete mode 100755 ci/maas/orange/pod2/lxc-add-more-interfaces
(limited to 'ci/maas/orange')
diff --git a/ci/maas/orange/pod1/deployment.yaml b/ci/maas/orange/pod1/deployment.yaml
index dcc8c447..9c5fbfee 100644
--- a/ci/maas/orange/pod1/deployment.yaml
+++ b/ci/maas/orange/pod1/deployment.yaml
@@ -17,6 +17,7 @@ demo-maas:
arch: amd64
pool: default
disk_size: 120G
+ release: trusty
# Apt http proxy setting(s)
apt_http_proxy:
@@ -25,6 +26,23 @@ demo-maas:
- 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/orange/pod2/compute-interfaces.host b/ci/maas/orange/pod2/compute-interfaces.host
deleted file mode 100644
index 185638e3..00000000
--- a/ci/maas/orange/pod2/compute-interfaces.host
+++ /dev/null
@@ -1,27 +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
-
-######################################
-#storage network for ceph on openstack
-auto eth1
-iface eth1 inet dhcp
-
-######################################
-#data network for VM on openstack
-auto eth5
-iface eth5 inet manual
-
-auto brData
-iface brData inet dhcp
- bridge_ports eth5
- bridge_stp off
- bridge_fd 0
- bridge_maxwait 0
diff --git a/ci/maas/orange/pod2/control-interfaces.host b/ci/maas/orange/pod2/control-interfaces.host
deleted file mode 100644
index e4604461..00000000
--- a/ci/maas/orange/pod2/control-interfaces.host
+++ /dev/null
@@ -1,27 +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
-
-######################################
-#storage network for ceph on openstack
-auto eth1
-iface eth1 inet dhcp
-
-######################################
-#data network for VM on openstack
-auto eth3
-iface eth3 inet manual
-
-auto brData
-iface brData inet dhcp
- bridge_ports eth3
- bridge_stp off
- bridge_fd 0
- bridge_maxwait 0
diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml
index 69af58d9..273f752d 100755
--- a/ci/maas/orange/pod2/deployment.yaml
+++ b/ci/maas/orange/pod2/deployment.yaml
@@ -17,6 +17,7 @@ demo-maas:
arch: amd64
pool: default
disk_size: 120G
+ release: trusty
# Apt http proxy setting(s)
apt_http_proxy:
@@ -25,6 +26,23 @@ demo-maas:
- 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/orange/pod2/interfaces.host b/ci/maas/orange/pod2/interfaces.host
deleted file mode 100644
index 9377814c..00000000
--- a/ci/maas/orange/pod2/interfaces.host
+++ /dev/null
@@ -1,36 +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
-######################################
-
-auto eth2
-iface eth2 inet manual
-
-auto eth2.721
-iface eth2.721 inet manual
-
-auto brData
-iface brData inet dhcp
- bridge_ports eth2.721
- bridge_stp off
- bridge_fd 0
- bridge_maxwait 0
-
-# The public network interface
-auto eth2.724
-iface eth2.724 inet manual
-
-auto brPublic
-iface brPublic inet dhcp
- bridge_ports eth2.724
- bridge_stp off
- bridge_fd 0
- bridge_maxwait 0
-
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 <<EOF >> "$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 <<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
- auto eth1
- iface eth1 inet dhcp
- 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"
--
cgit