diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-08-18 00:04:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-18 00:04:16 +0000 |
| commit | 3b37b935031b1db4a153eacb5019b0c3555486b1 (patch) | |
| tree | 45c12d4d9999226bd866aa240a504483b901a84d | |
| parent | db42501dad6b21ce57c9722c1b1d1af262a2e89e (diff) | |
| parent | 295ee1a3ae66746088cb841b6f691a6817943c0e (diff) | |
Merge "Adds fds networking-odl for ODL FDIO deployments"
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 8 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 34a7be7d..9b63ebc5 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -18,6 +18,13 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2 ##### Adding OpenDaylight to overcloud ##### ############################################### +# tar up fdio networking-odl +rm -rf fds +git clone https://gerrit.opnfv.org/gerrit/fds +pushd fds > /dev/null +tar -czvf ../networking-odl.tar.gz networking-odl +popd > /dev/null + # Beryllium Repo cat > /tmp/opendaylight.repo << EOF [opendaylight-4-release] @@ -52,6 +59,7 @@ popd > /dev/null # install Honeycomb # install Honeycomb puppet module LIBGUESTFS_BACKEND=direct virt-customize \ + --upload networking-odl.tar.gz:/root/ \ --upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \ --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index ef07ec0a..df17750b 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -94,6 +94,12 @@ EOF if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then sudo sed -i '/FdioEnabled:/c\ FdioEnabled: true' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml + if [ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]; then + LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /root/ && tar zxvf networking-odl.tar.gz" \ + --run-command "cd /root/networking-odl && git init && pip install -r requirements.txt" \ + --run-command "cd /root/networking-odl && python setup.py build && python setup.py install" \ + -a overcloud-full.qcow2 + fi else LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/dpdk_rpms/*" \ -a overcloud-full.qcow2 |