summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-10-02 00:08:26 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2015-10-02 00:08:26 -0500
commitd3398bd7441f593404ed9964a3986b96487d675e (patch)
tree88b0daf05bc2d3c5f87659c962e2b8be0760ae2f
parent382576f8f1e528d890c3477286ef5845b52ed6d4 (diff)
modified to download precise images also as part of MAAS install.
As opencontrail needs the precise image for cassandra and opencontrail charms. Change-Id: I44056819ac342d7a822bb1672404e19b6d727017
-rwxr-xr-xci/02-maasdeploy.sh11
-rwxr-xr-xci/deploy.sh6
2 files changed, 13 insertions, 4 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index e9bed10e..c90a4eb2 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -43,14 +43,21 @@ fi
sudo apt-add-repository ppa:maas-deployers/stable -y
sudo apt-add-repository ppa:juju/stable -y
+sudo apt-add-repository ppa:maas/stable -y
sudo apt-get update -y
-sudo apt-get install maas-deployer juju juju-deployer -y
+sudo apt-get install git maas-deployer juju juju-deployer maas-cli -y
+juju init -f
cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
maas-deployer -c deployment.yaml -d --force
+
echo "... Deployment of maas finish ...."
-#maas_ip=`grep " ip_address" deployment.yaml | cut -d ":" -f 2`
+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-selections create 1 os="ubuntu" release="trusty" arches="amd64" subarches="*" labels="*"
+maas maas boot-resources import
#echo "... Deployment of opnfv release Started ...."
#python deploy.py $maas_ip
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 51d44106..296f7b2e 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -55,13 +55,15 @@ deploy_dep() {
sudo apt-add-repository ppa:juju/stable -y
sudo apt-get update
sudo apt-get install juju juju-deployer -y
- juju init -y
+ juju init -f
cp environments.yaml ~/.juju/
}
deploy() {
#copy the script which needs to get deployed as part of ofnfv release
echo "deploying now"
+ cp environments.yaml ~/.juju/
+
cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh
./00-bootstrap.sh
@@ -75,6 +77,6 @@ if [ "$#" -eq 0 ]; then
fi
echo "deploying started"
-deploy_dep
+#deploy_dep
deploy
echo "deploying finished"