modified to take care of ceph disk assignment from labconfig.

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

4 files changed, 11 insertions, 19 deletions

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 22eea3f8..e46d0c11 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -33,23 +33,18 @@ esac
 if [ -e ~/.juju/deployment.yaml ]; then
    extport=`grep "ext-port" deployment.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
    sed --i "s@#ext-port: \"eth1\"@ext-port: \"$extport\"@g" ./bundles.yaml
+
    datanet=`grep "dataNetwork" deployment.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
    sed --i "s@#os-data-network: 10.4.8.0/21@os-data-network: $datanet@g" ./bundles.yaml
+
    admnet=`grep "admNetwork" deployment.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
    sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
+
+   cephdisk=`grep "disk" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+   sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
 fi
 
 case "$3" in
-     'intelpod9' )
-        # As per your lab vip address list be deafult uses 10.9.1.11 - 10.9.1.20
-         sed -i -- 's/10.4.1.1/10.9.1.2/g' ./bundles.yaml
-        # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.9.12.0\/24/g' ./bundles.yaml
-        # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1.905"/g' ./bundles.yaml
-        # Provide the gateway MAC to route the traffic externally.
-         sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml
-         ;;
      'attvirpod1' )
         # 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.10.1/g' ./bundles.yaml
@@ -73,10 +68,6 @@ case "$3" in
      'ravellodemopod' )
          sed -i -- 's/#ext-port: "eth1"/ext-port: "eth2"/g' ./bundles.yaml
         ;;
-     'custom' )
-         sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
-        ;;
      'default' )
          sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml
          sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
diff --git a/ci/deploy.py b/ci/deploy.py
index dadc964a..cef5d265 100644
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -52,7 +52,7 @@ opnfvcfg['demo-maas']={'juju-bootstrap':{'memory': 4096,'name': "bootstrap",\
                               }\
                       }
 
-opnfvcfg['opnfv']={'ext-port':'','floating-ip-range':'','dataNetwork':''}
+opnfvcfg['opnfv']={'ext-port':'','floating-ip-range':'','dataNetwork':'','ceph-disk':'/srv/'}
 
 opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:maas/stable")
 opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:juju/stable")
@@ -202,6 +202,7 @@ while c < len(labcfg["lab"]["racks"][0]["nodes"]):
 
 opnfvcfg["opnfv"]["floating-ip-range"]=labcfg["lab"]["racks"][0]["floating-ip-range"]
 opnfvcfg["opnfv"]["ext-port"]=labcfg["lab"]["racks"][0]["ext-port"]
+opnfvcfg["opnfv"]["ceph-disk"]=labcfg["opnfv"]["storage"][0]["disk"]
 
 with open('deployment.yaml', 'wa') as opnfvf:
    yaml.dump(opnfvcfg, opnfvf, default_flow_style=False)
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 0a91b4ac..a698ad1d 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -7,9 +7,9 @@ set -ex
 
 opnfvsdn=nosdn
 opnfvtype=nonha
-openstack=liberty
+openstack=mitaka
 opnfvlab=default
-opnfvrel=b
+opnfvrel=c
 opnfvfeature=odl_l2
 opnfvdistro=trusty
 opnfvarch=amd64
@@ -26,7 +26,7 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
                          [-t <nonha|ha|tip>] 
                          [-o <juno|liberty>]
                          [-l <default|intelpod5>]
-                         [-f <ipv6|dpdk|lxd|dvr>]
+                         [-f <ipv6,dpdk,lxd,dvr>]
                          [-d <trusty|xenial>]
                          [-a <amd64>]
                          [-r <a|b>]" 1>&2 exit 1; } 
diff --git a/labconfig/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml
index 2defa039..833b880a 100644
--- a/labconfig/intel/pod9/labconfig.yaml
+++ b/labconfig/intel/pod9/labconfig.yaml
@@ -64,7 +64,7 @@ opnfv:
     release: c
     distro: trusty
     type: nonha
-    openstack: liberty
+    openstack: mitaka
     sdncontroller:
     - type: nosdn
     storage: