openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Update the cirros version to "0.4.0""

Browse Source
This commit is contained in:
Zuul 2018-01-15 21:11:04 +00:00 committed by Gerrit Code Review
commit ec6327b44c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/provision.pp
View File

@ -62,14 +62,14 @@ class openstack_integration::provision {
container_format => 'bare',
disk_format => 'qcow2',
is_public => 'yes',
source => '/tmp/openstack/image/cirros-0.3.5-x86_64-disk.img'
source => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img'
}
glance_image { 'cirros_alt':
ensure => present,
container_format => 'bare',
disk_format => 'qcow2',
is_public => 'yes',
source => '/tmp/openstack/image/cirros-0.3.5-x86_64-disk.img'
source => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img'
}
Keystone_user_role['admin@openstack'] -> Glance_image<||>
}

2
manifests/tempest.pp
View File

@ -248,7 +248,7 @@ class openstack_integration::tempest (
db_flavor_ref => '42',
image_ssh_user => 'cirros',
image_alt_ssh_user => 'cirros',
img_file => 'cirros-0.3.5-x86_64-disk.img',
img_file => 'cirros-0.4.0-x86_64-disk.img',
compute_build_interval => 10,
ca_certificates_file => $::openstack_integration::params::ca_bundle_cert_path,
manage_tests_packages => true,

6
run_tests.sh
View File

@ -144,11 +144,11 @@ if [[ ! -e $IMG_DIR ]]; then
mkdir -p $IMG_DIR
fi
if [ -f ~/cache/files/cirros-0.3.5-x86_64-disk.img ]; then
if [ -f ~/cache/files/cirros-0.4.0-x86_64-disk.img ]; then
# Create a symlink for tempest.
ln -s ~/cache/files/cirros-0.3.5-x86_64-disk.img $IMG_DIR
ln -s ~/cache/files/cirros-0.4.0-x86_64-disk.img $IMG_DIR
else
wget http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P $IMG_DIR
wget http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P $IMG_DIR
fi
install_puppet