diff options
Diffstat (limited to 'build/overcloud-opendaylight.sh')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 9b63ebc5..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 \ @@ -67,9 +60,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \ --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \ --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \ - --run-command "yum -y install https://github.com/marosmars/files/raw/master/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 ../honeycomb-1.0.0-99.noarch.rpm:/root/ \ + --run-command "yum -y install /root/honeycomb-1.0.0-99.noarch.rpm" \ --upload ./setup_TEPs.py:/tmp \ -a overcloud-full-opendaylight_build.qcow2 |