summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-12-01 12:28:41 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-12-01 12:28:41 -0600
commit961a72560c9c6d1a5c3cf50c8e3358f88e901ff5 (patch)
treef0f205b70455c7dc26a02bb1c0e7154e83722402
parent43f181d4a673269248c7da585fd041d6ad216f76 (diff)
modified for bionic support for future deployment.
Change-Id: Ife9d8e071d2ffb36238decfa0f1d934d1a0b0c88 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/03-maasdeploy.sh25
1 files changed, 21 insertions, 4 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 005be47..7ea3cf3 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -21,6 +21,7 @@ then
usage;
fi
+opnfvdistro=`cat /etc/lsb-release | grep CODENAME | cut -d "=" -f 2`
virtinstall=0
labname=$1
@@ -50,17 +51,34 @@ sudo apt-get update -y || true
sudo apt-get install software-properties-common -y
sudo apt-add-repository ppa:juju/stable -y
sudo apt-add-repository ppa:maas/stable -y
-sudo apt-add-repository cloud-archive:pike -y
+if [ "bionic" == "$opnfvdistro" ]; then
+ echo "no cloud archive needed"
+else
+ sudo apt-add-repository cloud-archive:pike -y
+fi
+
if [ "aarch64" == "$NODE_ARCTYPE" ]; then
-sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y
+ if [ "bionic" == "$opnfvdistro" ]; then
+ echo "no repository needed"
+ else
+ sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y
+ fi
fi
sudo apt-get update -y || true
#sudo apt-get dist-upgrade -y
-sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \
+if [ "bionic" == "$opnfvdistro" ]; then
+ sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \
+ maas maas-region-controller juju python-pip python-psutil python-openstackclient \
+ python-congressclient gsutil pastebinit python-jinja2 sshpass \
+ openssh-server vlan ipmitool jq expect snap -y --allow-unauthenticated
+ sudo snap install charm
+else
+ sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \
maas maas-region-controller juju python-pip python-psutil python-openstackclient \
python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \
openssh-server vlan ipmitool jq expect snap -y --allow-unauthenticated
+fi
if [ "aarch64" == "$NODE_ARCTYPE" ]; then
sudo apt-get install qemu qemu-efi qemu-system-aarch64 -y --allow-unauthenticated
@@ -68,7 +86,6 @@ fi
sudo -H pip install --upgrade pip
-
#
# Config preparation
#