diff options
| author |   Guo Ruijing <ruijing.guo@intel.com> | 2017-10-18 19:56:15 -0400 |
|---|---|---|
| committer |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-12-13 16:36:50 +0000 |
| commit | d27608283966794e0b93cd9ce12412f6ab8d16e4 (patch) | |
| tree | 3901bc662f47e6ada1cc335322edddcb0bd9fbf2 /ci/03-maasdeploy.sh | |
| parent | 06afa960e508c999b9dd96488c1aef01f222fba0 (diff) | |
cleanup code
1. remove unused code due to juju>2 & maas>2.2 in Ubuntu16.04
2. remove deprecated 03-maasdeploy.sh
3. remove other unused code
Change-Id: I20fd0e96400db1262b0df3ef2b502c8001dd5b76
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
(cherry picked from commit 2819ba063c1a9896ccf437f85ca4c2ee463d7e80)
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 668eab91..3e5e2374 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -56,10 +56,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 @@ -222,14 +218,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/ @@ -686,12 +674,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 |