openstack
/
cookbook-openstack-image
Code Issues Proposed changes

Update CirrOS, Ubuntu image locations 

- include Artful instead of Zesty to keep up with the times
- update cirros references to 0.4.0
- remove stale repo reference

Change-Id: I8b63581849d9c7e9d67d56e16619191703868755
Implements: blueprint modern-chef
This commit is contained in:
Samuel Cassiba 2018-02-08 21:49:48 -08:00
parent 62ab2f7b2e
commit c11abab62d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
attributes/default.rb
View File

@ -70,10 +70,9 @@ default['openstack']['image']['cache']['grace_period'] = 3600
# Default Image Locations
default['openstack']['image']['upload_images'] = ['cirros']
default['openstack']['image']['upload_image']['artful'] = 'http://cloud-images.ubuntu.com/artful/current/artful-server-cloudimg-amd64-disk1.img'
default['openstack']['image']['upload_image']['xenial'] = 'http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img'
default['openstack']['image']['upload_image']['zesty'] = 'http://cloud-images.ubuntu.com/zesty/current/zesty-server-cloudimg-amd64-disk1.img'
default['openstack']['image']['upload_image']['cirros'] = 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img'
# more images available at https://github.com/rackerjoe/oz-image-build
default['openstack']['image']['upload_image']['cirros'] = 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img'
default['openstack']['image']['upload_image']['centos'] = 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2'
# To override image type
# The following disk format types are supported: qcow vhd vmdk vdi iso raw

6
spec/image_upload_spec.rb
View File

@ -19,7 +19,7 @@ describe 'openstack-image::image_upload' do
it 'uploads the cirros image' do
stub_command('glance --insecure --os-username admin --os-password admin-pass --os-project-name admin --os-image-url http://127.0.0.1:9292 --os-auth-url http://127.0.0.1:5000/v3 --os-user-domain-name Default --os-project-domain-name Default image-list | grep cirros').and_return(false)
expect(chef_run).to upload_openstack_image_image('Image setup for cirros').with(
image_url: 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img',
image_url: 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img',
image_name: 'cirros',
image_type: 'qcow',
image_public: true,
@ -39,10 +39,10 @@ describe 'openstack-image::image_upload' do
it 'uploads the tar image' do
node.set['openstack']['image']['upload_images'] = ['imageName']
node.set['openstack']['image']['upload_image']['imageName'] = 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz'
node.set['openstack']['image']['upload_image']['imageName'] = 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-uec.tar.gz'
stub_command('glance --insecure --os-username admin --os-password admin-pass --os-project-name admin --os-image-url http://127.0.0.1:9292 --os-auth-url http://127.0.0.1:5000/v3 --os-user-domain-name Default --os-project-domain-name Default image-list | grep imageName').and_return(false)
expect(chef_run).to upload_openstack_image_image('Image setup for imageName').with(
image_url: 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz',
image_url: 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-uec.tar.gz',
image_name: 'imageName',
image_type: 'unknown',
image_public: true