Fixes SFC deployments

[apex.git] / build / instack.sh

diff --git a/build/instack.sh b/build/instack.sh
index 8c92a05..3dfbf62 100755 (executable)
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -252,13 +252,13 @@ git checkout stable/liberty
 popd
 tar -czf puppet-aodh.tar.gz aodh
 
-# Add epel, aodh and ceph, remove openstack-neutron-openvswitch
+# Add epel, aodh and ceph
+# dhcp enable isolated_metadata and metada_tanetwork
 AODH_PKG="openstack-aodh-api,openstack-aodh-common,openstack-aodh-compat,openstack-aodh-evaluator,openstack-aodh-expirer"
 AODH_PKG+=",openstack-aodh-listener,openstack-aodh-notifier"
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload puppet-aodh.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && rm -rf aodh && tar xzf puppet-aodh.tar.gz" \
-    --run-command "yum remove -y openstack-neutron-openvswitch" \
     --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
     --run-command "if ! rpm -q epel-release > /dev/null; then yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm; fi" \
     --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
@@ -270,14 +270,14 @@ LIBGUESTFS_BACKEND=direct virt-customize \
 ###############################################
 
 cat > /tmp/opendaylight.repo << EOF
-[opendaylight]
-name=OpenDaylight \$releasever - \$basearch
+[opendaylight-42-beta]
+name=CentOS CBS OpenDaylight Beta Beryllium SR2 repository
 baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/\$basearch/os/
 enabled=1
 gpgcheck=0
 EOF
 
-odlrpm=opendaylight-4.0.0-1.rc3.1.el7.noarch.rpm
+odlrpm=opendaylight-4.2.0-1.20160407.144137180.el7.noarch.rpm
 LIBGUESTFS_BACKEND=direct virt-customize --upload ${rdo_images_uri/file:\/\//}/$odlrpm:/tmp/ \
     -a overcloud-full-opendaylight.qcow2
 opendaylight=/tmp/$odlrpm
@@ -293,7 +293,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
 
 # upload the opendaylight puppet module
 rm -rf puppet-opendaylight
-cp ${rdo_images_uri/file:\/\//}/puppet-opendaylight-3.2.2.tar.gz puppet-opendaylight.tar.gz
+cp ${rdo_images_uri/file:\/\//}/puppet-opendaylight-3.5.0.tar.gz puppet-opendaylight.tar.gz
 LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
                                          --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
                                          --upload ../opendaylight-puppet-neutron.patch:/tmp \
@@ -308,6 +308,8 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../opnfv-tripleo-heat-template
 # 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" \
+                                         --run-command "sed -i '/  \$enable_isolated_metadata = false,/c\\  \$enable_isolated_metadata = true,' /etc/puppet/modules/neutron/manifests/agents/dhcp.pp" \
+                                         --run-command "sed -i '/  \$enable_metadata_network  = false,/c\\  \$enable_metadata_network = true,' /etc/puppet/modules/neutron/manifests/agents/dhcp.pp" \
                                          -a overcloud-full-opendaylight.qcow2
 
 LIBGUESTFS_BACKEND=direct virt-customize --upload ../puppet-cinder-quota-fix.patch:/tmp \
@@ -341,7 +343,7 @@ Before=getty@tty1.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c "echo 'XFS Grow Bug Remount Sleeping 180s' && sleep 180 && echo 'XFS Grow Bug Remounting Now' && mount -o remount,inode64 /"
+ExecStart=/bin/bash -c "echo 'XFS Grow Bug Remount Sleeping 10s' && sleep 10 && echo 'XFS Grow Bug Remounting Now' && mount -o remount,inode64 /"
 RemainAfterExit=no
 
 [Install]