diff options
| author |   David Blaisonneau <david.blaisonneau@orange.com> | 2016-03-24 16:49:34 +0100 |
|---|---|---|
| committer |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-03-24 16:04:16 +0000 |
| commit | 17190fc75ee01f98949114a574ae095cda22e51a (patch) | |
| tree | ae1a96805cc880cea245f6a797364fd011084cdb | |
| parent | c3fe6f48a1f57f4061727dd23c87ae9ccba8968b (diff) | |
joid: auto-remove google client api to avoid installer crash
Change-Id: I91da8a738f8163d1fe2b451b47150e6f4cae50be
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
(cherry picked from commit 1b6a7d8ce677376eec16fb226d2eb30881f1cf76)
| -rwxr-xr-x | ci/02-maasdeploy.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index ddc7f2e0..4d948dcb 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -37,7 +37,7 @@ esac sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml -#make sure no password asked during the deployment. +#make sure no password asked during the deployment. echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init @@ -73,9 +73,15 @@ sudo apt-add-repository ppa:juju/stable -y sudo apt-add-repository ppa:maas/stable -y sudo apt-add-repository cloud-archive:liberty -y sudo apt-get update -y -sudo apt-get dist-upgrade -y +sudo apt-get dist-upgrade -y sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient gsutil -y +# To avoid problem between apiclient/maas_client and apiclient from google +# we remove the package google-api-python-client from yardstick installer +if [ $(pip list |grep google-api-python-client |wc -l) == 1 ]; then + sudo pip uninstall google-api-python-client +fi + sudo pip install shyaml juju init -f @@ -226,4 +232,3 @@ echo " .... MAAS deployment finished successfully ...." #echo "... Deployment of opnfv release Started ...." #python deploy.py $maas_ip - |