Merge branch 'stable/icehouse'

This commit is contained in:
James Slagle 2014-08-20 15:18:29 -04:00
commit 5ea6a88134
3 changed files with 8 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Name: instack-undercloud Name: instack-undercloud
Version: 1.0.4 Version: 1.0.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: Installation tools to install an undercloud via instack Summary: Installation tools to install an undercloud via instack
@ -74,6 +74,10 @@ cp -ar json-files %{buildroot}/%{_datadir}/instack-undercloud
%changelog %changelog
* Wed Aug 20 2014 James Slagle <jslagle@redhat.com> 1.0.5-1
- Wait for cinder volume to be available (jslagle@redhat.com)
- Default all nodes to 3GB (jslagle@redhat.com)
* Wed Aug 06 2014 James Slagle <jslagle@redhat.com> 1.0.4-1 * Wed Aug 06 2014 James Slagle <jslagle@redhat.com> 1.0.4-1
- Bump instack vm memory to 3GB (jslagle@redhat.com) - Bump instack vm memory to 3GB (jslagle@redhat.com)

View File

@ -1 +1 @@
1.0.4-1 ./ 1.0.5-1 ./

View File

@ -77,6 +77,8 @@ echo Compute test successful!
if [ $BLOCKSTORAGESCALE -gt 0 ]; then if [ $BLOCKSTORAGESCALE -gt 0 ]; then
CINDER_VOLUME_ID=$(cinder create 1 | grep " id " | awk '{print $4}') CINDER_VOLUME_ID=$(cinder create 1 | grep " id " | awk '{print $4}')
tripleo wait_for 10 3 cinder list \| grep available
nova volume-attach demo $CINDER_VOLUME_ID nova volume-attach demo $CINDER_VOLUME_ID
tripleo wait_for 30 10 ssh -o StrictHostKeyChecking=no fedora@$FLOATINGIP ls /dev/vdb tripleo wait_for 30 10 ssh -o StrictHostKeyChecking=no fedora@$FLOATINGIP ls /dev/vdb