From 109cda8b248cdd0de08d9b1d584f4433bf8cf1ce Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Fri, 8 Apr 2016 18:41:54 +0200 Subject: [PATCH] Fix image list in glance_image provider https://review.openstack.org/298718 changed the way images are listed, by removing the '--long' parameter. This breaks when called by the openstacklib provider, because that was the "properties" argument in https://github.com/openstack/puppet-openstacklib/blob/adb0b1d0122a5aeb66553b1e7340439dea7d0b13/lib/puppet/provider/openstack.rb#L74 so the command-line used '' as a last argument, causing the failure. This will require a stable/mitaka backport. Change-Id: I69e3cc848fbacbda01f9bd7d8a079c99b15cb5cf --- lib/puppet/provider/glance_image/openstack.rb | 2 +- spec/unit/provider/glance_image_spec.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/puppet/provider/glance_image/openstack.rb b/lib/puppet/provider/glance_image/openstack.rb index 20760eab..c00eb3a4 100644 --- a/lib/puppet/provider/glance_image/openstack.rb +++ b/lib/puppet/provider/glance_image/openstack.rb @@ -93,7 +93,7 @@ Puppet::Type.type(:glance_image).provide( end def self.instances - list = request('image', 'list') + list = request('image', 'list', '--long') list.collect do |image| attrs = request('image', 'show', image[:id]) properties = Hash[attrs[:properties].scan(/(\S+)='([^']*)'/)] rescue nil diff --git a/spec/unit/provider/glance_image_spec.rb b/spec/unit/provider/glance_image_spec.rb index 8bd183ec..df46b235 100644 --- a/spec/unit/provider/glance_image_spec.rb +++ b/spec/unit/provider/glance_image_spec.rb @@ -79,9 +79,9 @@ visibility="public" describe '.instances' do it 'finds every image' do provider.class.stubs(:openstack) - .with('image', 'list', '--quiet', '--format', 'csv', []) - .returns('"ID","Name","Status" -"5345b502-efe4-4852-a45d-edaba3a3acc6","image1","active" + .with('image', 'list', '--quiet', '--format', 'csv', '--long') + .returns('"ID","Name","Disk Format","Container Format","Size","Status" +"5345b502-efe4-4852-a45d-edaba3a3acc6","image1","raw","bare",1270,"active" ') provider.class.stubs(:openstack) .with('image', 'show', '--format', 'shell', '5345b502-efe4-4852-a45d-edaba3a3acc6') @@ -169,9 +169,9 @@ visibility="public" describe '.instances' do it 'finds every image' do provider.class.stubs(:openstack) - .with('image', 'list', '--quiet', '--format', 'csv', []) - .returns('"ID","Name","Status" -"5345b502-efe4-4852-a45d-edaba3a3acc6","image1","active" + .with('image', 'list', '--quiet', '--format', 'csv', '--long') + .returns('"ID","Name","Disk Format","Container Format","Size","Status" +"5345b502-efe4-4852-a45d-edaba3a3acc6","image1","raw","bare",1270,"active" ') provider.class.stubs(:openstack) .with('image', 'show', '--format', 'shell', '5345b502-efe4-4852-a45d-edaba3a3acc6')