openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Update the cirros version to 0.5.1"

Browse Source
This commit is contained in:
Zuul 2021-03-03 13:54:26 +00:00 committed by Gerrit Code Review
commit 6e3113cae2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/provision.pp
View File

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

2
manifests/tempest.pp
View File

@ -259,7 +259,7 @@ class openstack_integration::tempest (
image_alt_ssh_user => 'cirros', image_alt_ssh_user => 'cirros',
# TODO(emilien) optimization by 1/ using Hiera to configure Glance image source # TODO(emilien) optimization by 1/ using Hiera to configure Glance image source
# and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image. # and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image.
img_file => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img', img_file => '/tmp/openstack/image/cirros-0.5.1-x86_64-disk.img',
compute_build_interval => 10, compute_build_interval => 10,
ca_certificates_file => $::openstack_integration::params::ca_bundle_cert_path, ca_certificates_file => $::openstack_integration::params::ca_bundle_cert_path,
manage_tests_packages => true, manage_tests_packages => true,

8
run_tests.sh
View File

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