summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild/instack.sh10
-rw-r--r--docs/installation-instructions/introduction.rst2
2 files changed, 6 insertions, 6 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]
diff --git a/docs/installation-instructions/introduction.rst b/docs/installation-instructions/introduction.rst
index af8e03b6..feb83a59 100644
--- a/docs/installation-instructions/introduction.rst
+++ b/docs/installation-instructions/introduction.rst
@@ -11,7 +11,7 @@ Preface
=======
Apex uses the RDO Manager Open Source project as a server provisioning tool.
-RDO Manager is the RDO Project implimentation of OpenStack's Triple-O project.
+RDO Manager is the RDO Project implementation of OpenStack's Triple-O project.
The Triple-O image based life cycle installation tool provisions an OPNFV
Target System (3 controllers, n number of compute nodes) with OPNFV specific
configuration provided by the Apex deployment tool chain.