diff options
| -rwxr-xr-x | ci/01-deploybundle.sh | 6 | ||||
| -rwxr-xr-x | ci/deploy.sh | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index b3616661..8ac8101b 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -60,6 +60,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 9c97b110..6005eb1d 100755 --- 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. |