summaryrefslogtreecommitdiffstats
path: root/ci/maas/juniper
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-05-13 18:43:41 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-13 18:43:41 +0000
commit9d8c8164eddfaa12019b26292c55c8971b170f64 (patch)
tree665da6074ac8d476bb776fc0f2cae65b1fdafeb8 /ci/maas/juniper
parent3be824ad16a972f29eaa100544a1fdfddb344258 (diff)
parent1bb7f148a09b261ea0786cbc6a97abd9a629a36c (diff)
Merge "modified to download both trusty and xenial images."
Diffstat (limited to 'ci/maas/juniper')
-rwxr-xr-xci/maas/juniper/pod1/deployment.yaml18
1 files changed, 18 insertions, 0 deletions
diff --git a/ci/maas/juniper/pod1/deployment.yaml b/ci/maas/juniper/pod1/deployment.yaml
index efb49372..ead7abd6 100755
--- a/ci/maas/juniper/pod1/deployment.yaml
+++ b/ci/maas/juniper/pod1/deployment.yaml
@@ -17,6 +17,7 @@ demo-maas:
arch: amd64
pool: default
disk_size: 160G
+ 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