Code Review
/
releng.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0c71d6e
)
bugfix: should reset os_version from os_version_option
01/17301/2
author
meimei
<meimei@huawei.com>
Thu, 21 Jul 2016 06:29:12 +0000
(14:29 +0800)
committer
Fatih Degirmenci
<fatih.degirmenci@ericsson.com>
Thu, 21 Jul 2016 09:32:30 +0000
(09:32 +0000)
Change-Id: Ifcd9355055405c9c4f89a774d7a8fc44997884e3
Signed-off-by: meimei <meimei@huawei.com>
jjb/compass4nfv/compass-deploy.sh
patch
|
blob
|
history
diff --git
a/jjb/compass4nfv/compass-deploy.sh
b/jjb/compass4nfv/compass-deploy.sh
index
0231ea5
..
c70a4ec
100644
(file)
--- a/
jjb/compass4nfv/compass-deploy.sh
+++ b/
jjb/compass4nfv/compass-deploy.sh
@@
-48,6
+48,7
@@
export OS_VERSION=${COMPASS_OS_VERSION}
export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then
export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION}
+ export OS_VERSION=${COMPASS_OS_VERSION_OPTION}
fi
./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
if [ $? -ne 0 ]; then