summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorbobzh <bob.zh@huawei.com>2015-12-28 20:17:55 +0800
committerTim Rozet <trozet@redhat.com>2016-01-08 14:48:01 -0500
commitc43b4a2afad26f7b8f58ecfa3cb17304fa94dd8b (patch)
tree0730078cda1f017ca13a48f063ebcb087b49d895 /ci
parent194784ad1c2878a343377c7ea514ab2d8a95e06c (diff)
Adds onos support
Changes include: - ONOS artifacts are cached on build server until moved to OPNFV artifacts - tht patch is now unified to single opnfv patch, based on upstream commit 0f41e0d0309c7bc061dbaed6a8c1e38cb4bdfe19 Change-Id: Iea3d14773dded6c9709c08ef1beb47b254582860 Signed-off-by: bob zhou <bob.zh@huawei.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 01bf003d..4e9cfde0 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -698,8 +698,7 @@ function undercloud_prep_overcloud_deploy {
elif [ ${deploy_options_array['sdn_controller']} == 'opendaylight-external' ]; then
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml"
elif [ ${deploy_options_array['sdn_controller']} == 'onos' ]; then
- echo -e "${red}ERROR: ONOS is currently unsupported...exiting${reset}"
- exit 1
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml"
elif [ ${deploy_options_array['sdn_controller']} == 'opencontrail' ]; then
echo -e "${red}ERROR: OpenContrail is currently unsupported...exiting${reset}"
exit 1