Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
mdified to create a domain for heat after the deployment. It seems
[joid.git]
/
ci
/
deploy.sh
diff --git
a/ci/deploy.sh
b/ci/deploy.sh
index
9c97b11
..
1f41879
100755
(executable)
--- a/
ci/deploy.sh
+++ b/
ci/deploy.sh
@@
-10,6
+10,7
@@
opnfvtype=nonha
openstack=liberty
opnfvlab=default
opnfvrel=b
openstack=liberty
opnfvlab=default
opnfvrel=b
+opnfvfeature=odl_l2
read_config() {
opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2`
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>]
[-t <nonha|ha|tip>]
[-o <juno|liberty>]
[-l <default|intelpod5>]
+ [-f <ipv6|l2|l3|dvr>]
[-r <a|b>]" 1>&2 exit 1; }
[-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}
case "${opt}" in
s)
opnfvsdn=${OPTARG}
@@
-42,6
+44,9
@@
while getopts ":s:t:o:l:h:r:" opt; do
r)
opnfvrel=${OPTARG}
;;
r)
opnfvrel=${OPTARG}
;;
+ f)
+ opnfvfeature=${OPTARG}
+ ;;
h)
usage
;;
h)
usage
;;
@@
-116,7
+121,7
@@
deploy() {
./00-bootstrap.sh
#case default:
./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.
}
#check whether charms are still executing the code even juju-deployer says installed.
@@
-136,6
+141,8
@@
check_status() {
retval=1
fi
done
retval=1
fi
done
+ status=`juju action do heat/0 domain-setup`
+ echo $status
echo "...... deployment finishing ......."
}
echo "...... deployment finishing ......."
}
@@
-158,6
+165,11
@@
unitAddress()
createopenrc()
{
createopenrc()
{
+ if [ "$opnfvsdn" == "onos" ]; then
+ sh onos/juju_test_prepare.sh "$opnfvlab"
+ check_status
+ fi
+
mkdir -m 0700 -p cloud
controller_address=$(unitAddress keystone 0)
mkdir -m 0700 -p cloud
controller_address=$(unitAddress keystone 0)