summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-04-12 15:02:45 -0400
committerTim Rozet <trozet@redhat.com>2016-04-12 15:02:45 -0400
commit011907b693481782cc3966f0f16355da1dd259df (patch)
tree6120032a1d57b736f579fdee4b3584b31c80e6ab
parenta3f26b861d42cb4bccb5c5f925122805e01ec36c (diff)
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 <trozet@redhat.com>
-rwxr-xr-xbuild/instack.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/build/instack.sh b/build/instack.sh
index 77db08b..3dfbf62 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]