diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-04-13 13:59:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-13 13:59:57 +0000 |
| commit | 2c8475766a81f1c20ee21b38c0c5f6d69c056464 (patch) | |
| tree | 7b651e02032320c3d3984a276e27319397c59b87 | |
| parent | a816a957ecc5c805acd57020690b27c559cb21ed (diff) | |
| parent | 011907b693481782cc3966f0f16355da1dd259df (diff) | |
Merge "Fixes SFC deployments" into stable/brahmaputra
| -rwxr-xr-x | build/instack.sh | 10 |
1 files 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] |