diff options
| -rwxr-xr-x | ci/02-maasdeploy.sh | 1 | ||||
| -rwxr-xr-x | ci/maas/cengn_lynx/pod1/deployment.yaml | 3 | ||||
| -rw-r--r-- | ci/maas/custom/deployment.yaml | 3 | ||||
| -rw-r--r-- | ci/maas/default/deployment.yaml | 3 | ||||
| -rwxr-xr-x | ci/maas/intel/pod5/deployment.yaml | 3 | ||||
| -rwxr-xr-x | ci/maas/intel/pod6/deployment.yaml | 3 | ||||
| -rwxr-xr-x | ci/maas/intel/pod9/deployment.yaml | 3 | ||||
| -rwxr-xr-x | ci/maas/juniper/pod1/deployment.yaml | 3 | ||||
| -rw-r--r-- | ci/maas/orange/pod1/deployment.yaml | 3 | ||||
| -rwxr-xr-x | ci/maas/orange/pod2/deployment.yaml | 3 |
10 files changed, 18 insertions, 10 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 1f68a7d4..be978667 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -154,7 +154,6 @@ echo "... Deployment of maas finish ...." maas_ip=`grep " ip_address" deployment.yaml | cut -d " " -f 10` apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2` maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey} -maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/daily/" maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`" #Added the Qtip public to run the Qtip test after install on bare metal nodes. diff --git a/ci/maas/cengn_lynx/pod1/deployment.yaml b/ci/maas/cengn_lynx/pod1/deployment.yaml index 6b03c1e2..fe71144a 100755 --- a/ci/maas/cengn_lynx/pod1/deployment.yaml +++ b/ci/maas/cengn_lynx/pod1/deployment.yaml @@ -27,8 +27,9 @@ cengn-lynx-pod1: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/custom/deployment.yaml b/ci/maas/custom/deployment.yaml index ad2e2a0c..857237aa 100644 --- a/ci/maas/custom/deployment.yaml +++ b/ci/maas/custom/deployment.yaml @@ -40,8 +40,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/default/deployment.yaml b/ci/maas/default/deployment.yaml index ad2e2a0c..857237aa 100644 --- a/ci/maas/default/deployment.yaml +++ b/ci/maas/default/deployment.yaml @@ -40,8 +40,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml index 6600e954..be8a7732 100755 --- a/ci/maas/intel/pod5/deployment.yaml +++ b/ci/maas/intel/pod5/deployment.yaml @@ -27,8 +27,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml index ef1d8755..409a7ae2 100755 --- a/ci/maas/intel/pod6/deployment.yaml +++ b/ci/maas/intel/pod6/deployment.yaml @@ -27,8 +27,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/intel/pod9/deployment.yaml b/ci/maas/intel/pod9/deployment.yaml index 20aee25c..dcb2068b 100755 --- a/ci/maas/intel/pod9/deployment.yaml +++ b/ci/maas/intel/pod9/deployment.yaml @@ -27,8 +27,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/juniper/pod1/deployment.yaml b/ci/maas/juniper/pod1/deployment.yaml index ead7abd6..04b12293 100755 --- a/ci/maas/juniper/pod1/deployment.yaml +++ b/ci/maas/juniper/pod1/deployment.yaml @@ -27,8 +27,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/orange/pod1/deployment.yaml b/ci/maas/orange/pod1/deployment.yaml index 9c5fbfee..2ecf99d9 100644 --- a/ci/maas/orange/pod1/deployment.yaml +++ b/ci/maas/orange/pod1/deployment.yaml @@ -27,8 +27,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml index 273f752d..a5968ab9 100755 --- a/ci/maas/orange/pod2/deployment.yaml +++ b/ci/maas/orange/pod2/deployment.yaml @@ -27,8 +27,9 @@ demo-maas: - ppa:juju/stable boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + exclusive: true selections: 1: release: trusty |