added a command line option -f in deploy.sh to enable ipv6 during

deployment.

Change-Id: I628b37b4e9434a613851e020cb5be6fb1ac5934b
(cherry picked from commit 65fa4d4b473684b9dc97b12886026e306964edba)

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 455aef9..9452d7a 100755 (executable)
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -56,6 +56,12 @@ case "$3" in
         ;;
 esac
 
+case "$5" in
+    'ipv6' )
+         sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
+        ;;
+esac
+
 echo "... Deployment Started ...."
 case "$1" in
     'nonha' )

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9c97b11..6005eb1 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -10,6 +10,7 @@ opnfvtype=nonha
 openstack=liberty
 opnfvlab=default
 opnfvrel=b
+opnfvfeature=odl_l2
 
 read_config() {
     opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
@@ -23,9 +24,10 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>]
                          [-t <nonha|ha|tip>] 
                          [-o <juno|liberty>]
                          [-l <default|intelpod5>]
+                         [-f <ipv6|l2|l3|dvr>]
                          [-r <a|b>]" 1>&2 exit 1; } 
 
-while getopts ":s:t:o:l:h:r:" opt; do
+while getopts ":s:t:o:l:h:r:f:" opt; do
     case "${opt}" in
         s)
             opnfvsdn=${OPTARG}
@@ -42,6 +44,9 @@ while getopts ":s:t:o:l:h:r:" opt; do
         r)
             opnfvrel=${OPTARG}
             ;;
+        f)
+            opnfvfeature=${OPTARG}
+            ;;
         h)
             usage
             ;;
@@ -116,7 +121,7 @@ deploy() {
     ./00-bootstrap.sh
 
     #case default:
-    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn
+    ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature
 }
 
 #check whether charms are still executing the code even juju-deployer says installed.