diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-10-27 08:31:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-27 08:31:56 +0000 |
| commit | cad8852bf819f51f2e9602b11d4fc8b723623006 (patch) | |
| tree | d78bf4fb4ebd94df2a7d8209944b879b9c1fd1c0 /ci/03-maasdeploy.sh | |
| parent | 0b6cf885239f5612c19db205d9a827572ad73c8a (diff) | |
| parent | 2819ba063c1a9896ccf437f85ca4c2ee463d7e80 (diff) | |
Merge "cleanup code"
Diffstat (limited to 'ci/03-maasdeploy.sh')
| -rwxr-xr-x | ci/03-maasdeploy.sh | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index bc0c2cbb..09f497b5 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -58,10 +58,6 @@ sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvi python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \ openssh-server vlan ipmitool jq expect snap -y -#sudo apt-get install snap -y -#sudo snap install maas --classic -#sudo snap install juju --classic - sudo -H pip install --upgrade pip @@ -224,14 +220,6 @@ sudo cat ~maas/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys sudo cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys # -# MAAS deploy -# - -installmaas(){ - sudo apt-get install maas maas-region-controller -y -} - -# # MAAS config # https://insights.ubuntu.com/2016/01/23/maas-setup-deploying-openstack-on-maas-1-9-with-juju/ # http://blog.naydenov.net/2016/01/nodes-networking-deploying-openstack-on-maas-1-9-with-juju/ @@ -688,12 +676,8 @@ if [ -e ./labconfig.json ]; then fi # Add the cloud and controller credentials for MAAS for that lab. -jujuver=`juju --version` - -if [[ "$jujuver" > "2" ]]; then - addcloud - addcredential -fi +addcloud +addcredential # # End of scripts |