summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2015-12-09 15:52:38 -0500
committerDan Radez <dradez@redhat.com>2015-12-14 15:54:34 -0500
commit592edf4aac41985d4f802f8ee607af9171c516ed (patch)
treed838f99fe8cdc678d1c6ad1b0c6e2d971cb55af6 /ci
parentc59d834f3d2f57942f2b8d3bf86d71e53401d24f (diff)
updating the OpenDaylight patch
- using the proposed patched for upstream - ensuring l3_ha is disabled - exposing support for an ODL only node Change-Id: I6f4a50300ea08322eea4ba466fc1a3b0fbcb5743 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh12
1 files changed, 4 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index db802d2e..1c0d012c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -400,17 +400,12 @@ function copy_materials_to_instack {
echo "Copying configuration file and disk images to instack"
scp ${SSH_OPTIONS[@]} $RESOURCES/overcloud-full.qcow2 "stack@$UNDERCLOUD":
scp ${SSH_OPTIONS[@]} $NETENV "stack@$UNDERCLOUD":
- scp ${SSH_OPTIONS[@]} $CONFIG/opendaylight.yaml "stack@$UNDERCLOUD":
scp ${SSH_OPTIONS[@]} -r $CONFIG/nics/ "stack@$UNDERCLOUD":
if [[ ${#deploy_options_array[@]} -eq 0 || ${deploy_options_array['sdn_controller']} == 'opendaylight' ]]; then
- DEPLOY_OPTIONS+=" -e opendaylight.yaml"
- ## WORK AROUND
- # when OpenDaylight lands in upstream RDO manager this can be removed
- # apply the opendaylight patch
- scp ${SSH_OPTIONS[@]} $CONFIG/opendaylight.patch "root@$UNDERCLOUD":
- ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "cd /usr/share/openstack-tripleo-heat-templates/; patch -Np1 < /root/opendaylight.patch"
- ## END WORK AROUND
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
+ 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
@@ -484,6 +479,7 @@ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "openstack undercloud install > ape
if [ $net_isolation_enabled == "TRUE" ]; then
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml"
DEPLOY_OPTIONS+=" -e network-environment.yaml"
+ DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
fi
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI