Code Review
/
releng.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
a7108b1
)
Merge "Fix ODL restconf port if Compass"
author
Aric Gardner
<agardner@linuxfoundation.org>
Tue, 30 Oct 2018 17:56:10 +0000
(17:56 +0000)
committer
Gerrit Code Review
<gerrit@opnfv.org>
Tue, 30 Oct 2018 17:56:10 +0000
(17:56 +0000)
jjb/functest/functest-alpine.sh
patch
|
blob
|
history
diff --git
a/jjb/functest/functest-alpine.sh
b/jjb/functest/functest-alpine.sh
index
6f6e130
..
0d9f2ab
100755
(executable)
--- a/
jjb/functest/functest-alpine.sh
+++ b/
jjb/functest/functest-alpine.sh
@@
-157,6
+157,10
@@
if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then
envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}"
fi
+if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then
+ envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080"
+fi
+
if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then
if [[ -n ${IMAGE_PROPERTIES} ]]; then
IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large"