diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-11-11 15:32:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-11 15:32:56 +0000 |
| commit | 347201e194d84f23e247d1110c705256cf9f2070 (patch) | |
| tree | 7bc8b6a3830c6a2052fd9d247035267e7e3eaaf2 /ci/deploy.sh | |
| parent | c37b85a4d356212402277741a3cec793ccf47e68 (diff) | |
| parent | f579df75d3a7b14e9c85fa6667deaab91a4339c4 (diff) | |
Merge "adding the opendaylight integration"
Diffstat (limited to 'ci/deploy.sh')
| -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 13b7c042..153ce339 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 } |