diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-10-26 09:22:12 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-03-27 20:01:14 +0000 |
| commit | 8badc32b6e87e925b198fa778c426265be86586b (patch) | |
| tree | d97977c34e23103872fd62ac0a8279dc78713d08 /build/overcloud-full.sh | |
| parent | 33828db100ef502c8ef4eb66380d10a83a08d182 (diff) | |
Adding OVN as an SDN option to Apex
JIRA: APEX-129
opnfv-tht-pr: 111
opnfv-puppet-tripleo-pr: 18
Change-Id: I71de5802ed476b6f78ad5a718ac15d9aec9a6a1d
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index cfda0398..dbf297fd 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -68,6 +68,13 @@ pushd puppet-tacker > /dev/null git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz popd > /dev/null +# tar up the ovn puppet module +rm -rf puppet-ovn +git clone https://github.com/openstack/puppet-ovn +pushd puppet-ovn > /dev/null +git archive --format=tar.gz --prefix=ovn/ origin/stable/ocata > ${BUILD_DIR}/puppet-ovn.tar.gz +popd > /dev/null + # Master FD.IO Repo cat > ${BUILD_DIR}/fdio.repo << EOF [fdio-master] @@ -104,11 +111,11 @@ qemu-img resize overcloud-full_build.qcow2 +900MB LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "xfs_growfs /dev/sda" \ --upload ${BUILD_DIR}/opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ + --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \ --run-command "yum update -y python-ipaddress rabbitmq-server erlang*" \ --run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \ --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ - --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \ --run-command "mkdir /root/dpdk_rpms" \ --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \ $dpdk_pkg_str \ @@ -142,6 +149,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install /root/$tacker_pkg \ --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \ --install /root/$tackerclient_pkg \ + --upload ${BUILD_DIR}/puppet-ovn.tar.gz:/etc/puppet/modules/ \ + --run-command "cd /etc/puppet/modules/ && rm -fr ovn && tar xzf puppet-ovn.tar.gz" \ + --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \ + --run-command "mkdir /root/ovs27" \ + --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \ --run-command "pip install python-senlinclient" \ --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ --upload ${BUILD_ROOT}/patches/puppet-neutron-add-odl-settings.patch:/usr/share/openstack-puppet/modules/neutron/ \ |