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/custom/deployment.yaml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'ci/maas/custom') diff --git a/ci/maas/custom/deployment.yaml b/ci/maas/custom/deployment.yaml index 9207eebd..ad2e2a0c 100644 --- a/ci/maas/custom/deployment.yaml +++ b/ci/maas/custom/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 -- cgit 1.2.3-korg