diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-10-27 01:55:20 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-11-07 09:23:36 -0500 |
| commit | f579df75d3a7b14e9c85fa6667deaab91a4339c4 (patch) | |
| tree | 583abd4291577d5828487f5bc08426581fd806ec /ci | |
| parent | 9adcc8960d835607317810b1d060beaca0f6cec5 (diff) | |
adding the opendaylight integration
Change-Id: Iaaf5cbc790abd3b7af6f94b4e6d7e8ecfbbc6534
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 0a5a2a82..251fc72e 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -198,6 +198,14 @@ function copy_materials { scp ${SSH_OPTIONS[@]} $RESOURCES/overcloud-full.initrd "stack@$UNDERCLOUD": scp ${SSH_OPTIONS[@]} $RESOURCES/overcloud-full.qcow2 "stack@$UNDERCLOUD": scp ${SSH_OPTIONS[@]} $RESOURCES/overcloud-full.vmlinuz "stack@$UNDERCLOUD": + scp ${SSH_OPTIONS[@]} $CONFIG/opendaylight.yaml "stack@$UNDERCLOUD": + + ## 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 # ensure stack user on instack machine has an ssh key ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "if [ ! -e ~/.ssh/id_rsa.pub ]; then ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa; fi" @@ -264,7 +272,7 @@ echo "Configuring nameserver on ctlplane network" neutron subnet-update \$(neutron subnet-list | grep -v id | grep -v \\\\-\\\\- | awk {'print \$2'}) --dns-nameserver 8.8.8.8 echo "Executing overcloud deployment, this should run for an extended period without output." sleep 60 #wait for Hypervisor stats to check-in to nova -openstack overcloud deploy --templates $DEPLOY_OPTIONS +openstack overcloud deploy --templates $DEPLOY_OPTIONS -e opendaylight.yaml EOI } |