diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-13 18:43:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-13 18:43:41 +0000 |
| commit | 9d8c8164eddfaa12019b26292c55c8971b170f64 (patch) | |
| tree | 665da6074ac8d476bb776fc0f2cae65b1fdafeb8 /ci/maas/custom | |
| parent | 3be824ad16a972f29eaa100544a1fdfddb344258 (diff) | |
| parent | 1bb7f148a09b261ea0786cbc6a97abd9a629a36c (diff) | |
Merge "modified to download both trusty and xenial images."
Diffstat (limited to 'ci/maas/custom')
| -rw-r--r-- | ci/maas/custom/deployment.yaml | 21 |
1 files changed, 19 insertions, 2 deletions
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 |