modified cengn pod1 as per details provided.

Change-Id: Ic92d99a237cd82d0d3429d952b5a561a1c1efc8b
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

6 files changed, 51 insertions, 39 deletions

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 4634b4db..08bdc98f 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -87,6 +87,7 @@ else
             labname="default"
             ./cleanvm.sh
             cp ../labconfig/default/deployment.yaml ./
+            cp ../labconfig/default/deployconfig.yaml ./
             ;;
     esac
 fi
@@ -298,10 +299,6 @@ case "$labname" in
         enableautomode eth1.1201 AUTO "172.16.121.3/24" compute || true
         enableautomode eth1.1201 AUTO "172.16.121.3/24" control || true
         ;;
-    'cengnpod1' )
-        maas refresh
-        enableautomode eth2 AUTO "172.16.20.0/24" || true
-        ;;
 esac
 
 enable_if
diff --git a/ci/README b/ci/README
index 47856fbd..35d27ac8 100644
--- a/ci/README
+++ b/ci/README
@@ -1,22 +1,22 @@
 MAAS pre requisite before deploying the solution:
 =================================================
 
-MAAS version 1.8.0 or latest should be installed and configure 
+MAAS version 1.9.3 or latest should be installed and configure
 from ppa:maas/stable
 
 Please do the following once you have configure the MAAS cluster and regional
 controller.
 
-1. Create two KVM virtual machine and have it named as bootstrap.maas and 
+1. Create two KVM virtual machine and have it named as bootstrap.maas and
    node1.maas
-2. Maually add chassis in MAAS with virsh as option and have both nodes listed 
+2. Maually add chassis in MAAS with virsh as option and have both nodes listed
    and commionined in MAAS.
-3. Have all other physical nodes added into maas by PXE boot the nodes and 
-   make sure node gets pxe booted theroug MAAS.
+3. Have all other physical nodes added into maas by PXE boot the nodes and
+   make sure node gets pxe booted through MAAS.
 4. Tag all physical nodes as physical.
-5. Tag bootstrap.maas as bootstrap and nodea.maas as neutron and gateway.
+5. Tag bootstrap.maas as bootstrap and node1.maas as neutron and gateway.
 
-install juju 
+install juju
 ============
 
 add juju stable ppa by running command sudo apt-add-repository ppa:juju/stable
@@ -34,12 +34,15 @@ deploy the bundle
 
 run the following commands to clone a git repository and run the bundle.
 
-git clone https://narindergupta@gerrit.opnfv.org/gerrit/joid
-# to depploy odl with kilo in nonha mode
-./deploy.sh -s odl -o kilo -t nonha
+git clone https://gerrit.opnfv.org/gerrit/joid.git
 
-# to deploy openstail with kilo in nonha mode
-./deply.sh -s opencontrail -o kilo -t nonha
+copy the environments.yaml file from ~/.juju/ to joid/ci/
+
+# to deploy odl with mitaka in nonha mode
+./deploy.sh -s odl -o mitaka -t nonha
+
+# to deploy opencontail with liberty in nonha mode
+./deply.sh -s opencontrail -o liberty -t nonha
 
 NOTE: Wait for approximately 30-45 minutes and your openstack will be ready to use.
 
diff --git a/ci/deploy.yaml b/ci/deploy.yaml
deleted file mode 100755
index cfa45999..00000000
--- a/ci/deploy.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file defines the deployment for the MAAS environment which is to be
-# deployed and automated.
-opnfv:
-    # Defines the openstack release needs to be get installed.
-    release:B
-    # Defines the openstack release needs to be get installed.
-    openstack:liberty
-    # Defines the sdn plugin to be get installed.
-    sdn:odl
-    # Defines the ha type to be get installed.
-    type:ha
-    # Defines the lab where release to be get installed.
-    lab:default
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 89194ded..07687e7e 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -69,20 +69,22 @@ neutron net-create ext-net --shared --router:external --provider:physical_networ
 ## Parse Network config
 ##
 
-EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
+if [ -f ./deployconfig.yaml ];then
+    EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
 
-# split EXTERNAL_NETWORK=first ip;last ip; gateway;network
+    # split EXTERNAL_NETWORK=first ip;last ip; gateway;network
 
-EXTNET=(${EXTERNAL_NETWORK//,/ })
+    EXTNET=(${EXTERNAL_NETWORK//,/ })
 
-EXTNET_FIP=${EXTNET[0]}
-EXTNET_LIP=${EXTNET[1]}
-EXTNET_GW=${EXTNET[2]}
-EXTNET_NET=${EXTNET[3]}
+    EXTNET_FIP=${EXTNET[0]}
+    EXTNET_LIP=${EXTNET[1]}
+    EXTNET_GW=${EXTNET[2]}
+    EXTNET_NET=${EXTNET[3]}
 
-neutron subnet-create ext-net --name ext-subnet \
-   --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
-      --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
+    neutron subnet-create ext-net --name ext-subnet \
+       --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
+          --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
+fi
 
 # create vm network
 neutron net-create demo-net
diff --git a/labconfig/cengn/pod1/labconfig.yaml b/labconfig/cengn/pod1/labconfig.yaml
index 781b93c0..754ccacf 100644
--- a/labconfig/cengn/pod1/labconfig.yaml
+++ b/labconfig/cengn/pod1/labconfig.yaml
@@ -10,6 +10,9 @@ lab:
       - ifname: eth0
         spaces: [admin]
         mac: ["00:a0:a5:90:89:a8"]
+      - ifname: eth3
+        spaces: [data]
+        mac: ["00:a0:a5:90:89:a7"]
       power:
         type: ipmi
         address: 10.21.5.12
@@ -22,6 +25,9 @@ lab:
       - ifname: eth0
         spaces: [admin]
         mac: ["00:a0:a5:90:89:28"]
+      - ifname: eth3
+        spaces: [data]
+        mac: ["00:a0:a5:90:89:27"]
       power:
         type: ipmi
         address: 10.21.5.13
@@ -34,6 +40,9 @@ lab:
       - ifname: eth0
         spaces: [admin]
         mac: ["00:a0:a5:89:30:c6"]
+      - ifname: eth3
+        spaces: [data]
+        mac: ["00:a0:a5:89:30:c5"]
       power:
         type: ipmi
         address: 10.21.5.14
@@ -46,6 +55,9 @@ lab:
       - ifname: eth0
         spaces: [admin]
         mac: ["00:a0:a5:90:89:94"]
+      - ifname: eth3
+        spaces: [data]
+        mac: ["00:a0:a5:90:89:93"]
       power:
         type: ipmi
         address: 10.21.5.15
@@ -58,6 +70,9 @@ lab:
       - ifname: eth0
         spaces: [admin]
         mac: ["00:a0:a5:90:89:0e"]
+      - ifname: eth3
+        spaces: [data]
+        mac: ["00:a0:a5:90:89:0d"]
       power:
         type: ipmi
         address: 10.21.5.16
diff --git a/labconfig/default/deployconfig.yaml b/labconfig/default/deployconfig.yaml
new file mode 100644
index 00000000..46a14b08
--- /dev/null
+++ b/labconfig/default/deployconfig.yaml
@@ -0,0 +1,8 @@
+opnfv:
+  admNetwork: 192.168.122.1
+  ceph-disk: /srv
+  dataNetwork: ''
+  ext-port: eth1
+  floating-ip-range: 192.168.122.30,192.168.122.49,192.168.122.1,192.168.122.0/24
+  interface-enable: ''
+  storageNetwork: ''