From 011907b693481782cc3966f0f16355da1dd259df Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 12 Apr 2016 15:02:45 -0400 Subject: Fixes SFC deployments Changes include: - Upgrades ODL to beta SR2 (includes SFC fix) - Modifies growfs fix by shortening delay to 10 seconds Change-Id: If25dc847a62bd7c56dfc1bc626b201db41f35cc0 Signed-off-by: Tim Rozet --- build/instack.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/instack.sh b/build/instack.sh index 77db08be..3dfbf622 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -270,14 +270,14 @@ LIBGUESTFS_BACKEND=direct virt-customize \ ############################################### cat > /tmp/opendaylight.repo << EOF -[opendaylight-41-release] -name=CentOS CBS OpenDaylight Beryllium SR1 repository -baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-41-release/\$basearch/os/ +[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.1.0-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 @@ -343,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] -- cgit 1.2.3-korg