summaryrefslogtreecommitdiffstats
path: root/ci/03-maasdeploy.sh
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-12-01 16:30:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-01 16:30:11 +0000
commitab8d1ec481c222870a27e2f7c3c7b6d5465252ce (patch)
tree57cf145469d547224b1aad8487d31c07ff8425aa /ci/03-maasdeploy.sh
parent905cbf68be10940e56ae5508f1f605a3994cd593 (diff)
parent9186c816d279c47a6a89abc9e587128c41bdd08f (diff)
Merge "Revert "adding latest release charm support.""
Diffstat (limited to 'ci/03-maasdeploy.sh')
-rwxr-xr-xci/03-maasdeploy.sh24
1 files changed, 3 insertions, 21 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 934c8cc1..005be470 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -21,7 +21,6 @@ then
usage;
fi
-opnfvdistro=`cat /etc/lsb-release | grep CODENAME | cut -d "=" -f 2`
virtinstall=0
labname=$1
@@ -51,34 +50,17 @@ 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
-if [ "bionic" == "$opnfvdistro" ]; then
- echo "no cloud archive needed"
-else
- sudo apt-add-repository cloud-archive:pike -y
-fi
-
+sudo apt-add-repository cloud-archive:pike -y
if [ "aarch64" == "$NODE_ARCTYPE" ]; then
- if [ "bionic" == "$opnfvdistro" ]; then
- echo "no repository needed"
- else
- sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y
- fi
+sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y
fi
sudo apt-get update -y || true
#sudo apt-get dist-upgrade -y
-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 \
+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