diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-08-22 13:42:20 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-08-24 18:36:23 -0400 |
| commit | 130254ca844d0ee2f8daf5e928c11ee1ba03433d (patch) | |
| tree | ce0aa3c3ed6cdb4caae3cc8a894fa956c3c8c178 | |
| parent | 550863da64fd0b759a0cc2f463a039566a212305 (diff) | |
Migrates fdio/honeycomb to new single module
JIRA: APEX-133
opnfv-tht-pr: 66
Change-Id: I4e529fa83330d090fc2bb42283d98f02cf1454eb
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 621a427d..65f9c06e 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -46,18 +46,11 @@ EOF # SDNVPN - Copy tunnel setup script wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py -# tar up the honeycomb module -rm -rf puppet-honeycomb -git clone https://github.com/trozet/puppet-honeycomb -pushd puppet-honeycomb > /dev/null -git archive --format=tar.gz --prefix=honeycomb/ HEAD > ../puppet-honeycomb.tar.gz -popd > /dev/null # install ODL packages # install Jolokia for ODL HA # Patch in OPNFV custom puppet-tripleO # 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 \ @@ -69,8 +62,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \ --upload ../honeycomb-1.0.0-99.noarch.rpm:/root/ \ --run-command "yum -y install /root/honeycomb-1.0.0-99.noarch.rpm" \ - --upload puppet-honeycomb.tar.gz:/etc/puppet/modules \ - --run-command "cd /etc/puppet/modules && tar xzf puppet-honeycomb.tar.gz" \ --upload ./setup_TEPs.py:/tmp \ -a overcloud-full-opendaylight_build.qcow2 |