summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-05-14 12:33:19 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-05-14 12:34:21 -0500
commit7cfca76c31a05ddc4b124d9074fa13ae04929cdb (patch)
treeef0932902602612ea6fc8ea0161b85f068109ed2
parent9d8c8164eddfaa12019b26292c55c8971b170f64 (diff)
modified maas deployment file to include the daily images.
Change-Id: I0a8d6ebd00e20e8d036858be7f2f2503752b430c Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/02-maasdeploy.sh1
-rwxr-xr-xci/maas/cengn_lynx/pod1/deployment.yaml3
-rw-r--r--ci/maas/custom/deployment.yaml3
-rw-r--r--ci/maas/default/deployment.yaml3
-rwxr-xr-xci/maas/intel/pod5/deployment.yaml3
-rwxr-xr-xci/maas/intel/pod6/deployment.yaml3
-rwxr-xr-xci/maas/intel/pod9/deployment.yaml3
-rwxr-xr-xci/maas/juniper/pod1/deployment.yaml3
-rw-r--r--ci/maas/orange/pod1/deployment.yaml3
-rwxr-xr-xci/maas/orange/pod2/deployment.yaml3
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