stackforge
/
puppet-openstack
Code Issues Proposed changes

Update Cirros to 0.3.2 

Update Cirros image install to use newest version (0.3.2).

Change-Id: Ifedeec1c6660bde11c0833e2e50d3b316170fe76
Closes-Bug: #1301901
This commit is contained in:
Chris Ricker 2014-04-03 05:11:09 -07:00
parent 6509520a04
commit f93374ebdf
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/provision.pp
View File

@ -49,7 +49,7 @@ class openstack::provision(
## Glance
$image_name = 'cirros',
$image_source = 'http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img',
$image_source = 'http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img',
$image_ssh_user = 'cirros',
## Neutron

4
spec/classes/openstack_provision_spec.rb
View File

@ -12,7 +12,7 @@ describe 'openstack::provision' do
let :params do
{
:image_name => 'cirros',
:image_source => 'http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img',
:image_source => 'http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img',
:image_name_alt => 'cirros2',
}
end
@ -40,7 +40,7 @@ describe 'openstack::provision' do
let :params do
{
:image_name => 'cirros',
:image_source => 'http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img',
:image_source => 'http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img',
}
end

4
templates/test_nova.sh.erb
View File

@ -6,10 +6,10 @@ source <%= @rc_file_path %>
<% if @image_type == 'cirros' -%>
# Grab an image. Cirros is a nice small Linux that's easy to deploy
wget --quiet http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img
wget --quiet http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img
# Add it to glance so that we can use it in Openstack
glance add name='cirros image' is_public=true container_format=bare disk_format=qcow2 < cirros-0.3.1-x86_64-disk.img
glance add name='cirros image' is_public=true container_format=bare disk_format=qcow2 < cirros-0.3.2-x86_64-disk.img
# Caputre the Image ID so taht we can call the right UUID for this image
IMAGE_ID=`glance index | grep 'cirros image' | head -1 | awk -F' ' '{print $1}'`