Merge "Restructured the installation-instruction file into indexed sub files"

[apex.git] / build / instack.sh

diff --git a/build/instack.sh b/build/instack.sh
index 54f05d5..eb017c2 100755 (executable)
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -63,7 +63,7 @@ fi
 cat << 'EOF' | sudo tee /etc/yum.repos.d/opendaylight.repo
 [opendaylight]
 name=OpenDaylight $releasever - $basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/$basearch/os/
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-33-release/$basearch/os/
 enabled=1
 gpgcheck=0
 EOF
@@ -254,7 +254,7 @@ LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y openstack-
 
 # upload the opendaylight puppet module
 rm -rf puppet-opendaylight
-git clone https://github.com/dfarrell07/puppet-opendaylight
+git clone -b 2.2.0 https://github.com/dfarrell07/puppet-opendaylight
 pushd puppet-opendaylight
 git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
 popd
@@ -268,6 +268,10 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../opnfv-tripleo-heat-template
 LIBGUESTFS_BACKEND=direct virt-customize --upload ../opendaylight-puppet-neutron.patch:/tmp \
                                          --run-command "cd /etc/puppet/modules/neutron && patch -Np1 < /tmp/opendaylight-puppet-neutron.patch" \
                                          -a overcloud-full-odl.qcow2
+# REMOVE ME AFTER Brahmaputra
+LIBGUESTFS_BACKEND=direct virt-customize --upload ../puppet-neutron-force-metadata.patch:/tmp \
+                                         --run-command "cd /etc/puppet/modules/neutron && patch -Np1 < /tmp/puppet-neutron-force-metadata.patch" \
+                                         -a overcloud-full-odl.qcow2
 ## END WORK AROUND
 popd
 
@@ -286,8 +290,9 @@ curl ${onos_artifacts_uri}/jdk-8u51-linux-x64.tar.gz -o ./jdk-8u51-linux-x64.tar
 curl ${onos_artifacts_uri}/onos-1.3.0.tar.gz -o ./onos-1.3.0.tar.gz
 curl ${onos_artifacts_uri}/repository.tar -o ./repository.tar
 popd
-git archive --format=tar.gz --prefix=onos/ HEAD > ../puppet-onos.tar.gz
 popd
+mv puppet-onos onos
+tar -czf puppet-onos.tar.gz onos
 LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-onos.tar.gz:/etc/puppet/modules/ \
                                          --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" -a overcloud-full-odl.qcow2