summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-12-02 13:53:58 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-02 13:53:59 +0000
commit0bbbf469f23853b861ebdee8a462b527da2696be (patch)
treeebb878960f46fcd4ee931471be27f52a15011f29
parentec5d3adbef189e096259f96442c83af85ff669b0 (diff)
parent0745854cbec7f732f408d8ec552cbe0e4e0f29fc (diff)
Merge "modified to install openssh-server in case not installed. Also there were typo in virpod1 data."
-rwxr-xr-xci/02-maasdeploy.sh2
-rwxr-xr-xci/odl/01-deploybundle.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index a18fe03c..d5e02620 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -48,7 +48,7 @@ sudo apt-add-repository ppa:maas-deployers/stable -y
sudo apt-add-repository ppa:juju/stable -y
sudo apt-add-repository ppa:maas/stable -y
sudo apt-get update -y
-sudo apt-get install git maas-deployer juju juju-deployer maas-cli -y
+sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli -y
juju init -f
cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 15ff77b1..a5ab1613 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -59,8 +59,8 @@ case "$3" in
'attvirpod1' )
cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
- cp maas/att/airpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
- cp maas/att/airpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
+ cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
+ cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
# As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
sed -i -- 's/10.4.1.1/192.168.1.1/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.