From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 16 Dec 2015 05:55:07 +0000 (-0600)
Subject: modified the installer to have python-pip installed.
X-Git-Tag: brahmaputra.1.0~104
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F4625%2F1;p=joid.git

modified the installer to have python-pip installed.
Modified the deployment.yaml as per common config as MAAS will
gather rest of data during commisoning process.

Change-Id: Ie576d612903736e1cad1875886e2f8d77e914b5f
---

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index fb72ccd6..8ef8565e 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -60,12 +60,13 @@ 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 openssh-server git maas-deployer juju juju-deployer maas-cli -y
+sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip -y
+sudo pip install shyaml
 juju init -f
 
 cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
 
-if [ $virtinstall ]; then
+if [ "$virtinstall" -eq 1 ]; then
     sudo virsh net-dumpxml default > default-net-org.xml
     sudo sed -i '/dhcp/d' default-net-org.xml
     sudo sed -i '/range/d' default-net-org.xml
@@ -89,7 +90,7 @@ maas maas boot-resources import
 maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
 
 #adding compute and control nodes VM to MAAS for deployment purpose.
-if [ $virtinstall ]; then
+if [ "$virtinstall" -eq 1 ]; then
     # create two more VMs to do the deployment.
     sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
 
diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml
index 523f3dd3..0d249a7c 100755
--- a/ci/maas/intel/pod6/deployment.yaml
+++ b/ci/maas/intel/pod6/deployment.yaml
@@ -145,9 +145,6 @@ demo-maas:
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:0b:71"
-                  - "00:1e:67:e0:0b:72"
-                  - "00:1e:67:d0:9a:8c"
-                  - "00:1e:67:d0:9a:8d"
               power:
                   type: ipmi
                   address: 10.4.7.2
@@ -181,9 +178,6 @@ demo-maas:
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:09:32"
-                  - "00:1e:67:e0:09:33"
-                  - "00:1e:67:d0:9b:92"
-                  - "00:1e:67:d0:9b:93"
               power:
                   type: ipmi
                   address: 10.4.7.3
@@ -199,9 +193,6 @@ demo-maas:
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:e0:09:fa"
-                  - "00:1e:67:e0:09:fb"
-                  - "00:1e:67:d0:9c:9c"
-                  - "00:1e:67:d0:9c:9d"
               power:
                   type: ipmi
                   address: 10.4.7.4
@@ -217,9 +208,6 @@ demo-maas:
               architecture: amd64/generic
               mac_addresses:
                   - "00:1e:67:cf:bc:f7"
-                  - "00:1e:67:cf:bc:f8"
-                  - "00:1e:67:d0:9c:26"
-                  - "00:1e:67:d0:9c:27"
               power:
                   type: ipmi
                   address: 10.4.7.5