openstack
/
puppet-nova
Code Issues Proposed changes

Merge "nova_flavor: Accept array format about access_project_ids" into stable/wallaby

This commit is contained in:
Zuul 2021-04-28 18:22:22 +00:00 committed by Gerrit Code Review
parent ebc6447e42 b47f63cea8
commit 091ee8c231
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/puppet/provider/nova_flavor/openstack.rb
View File

@ -89,11 +89,17 @@ Puppet::Type.type(:nova_flavor).provide(
def self.instances
request('flavor', 'list', ['--long', '--all']).collect do |attrs|
project = request('flavor', 'show', [attrs[:id], '-c', 'access_project_ids'])
access_project_ids = project[:access_project_ids]
# Client can return None and this should be considered as ''
if project[:access_project_ids].downcase.chomp == 'none'
if access_project_ids.downcase.chomp == 'none'
project_value = ''
# If the ids are formatted as Array, surrounding [] should be removed
elsif access_project_ids.start_with?('[') and access_project_ids.end_with?(']')
# TODO(tkajinam): We'd need to consider multiple projects can be returned
project_value = access_project_ids[1..-2]
else
project_value = project[:access_project_ids]
project_value = access_project_ids
end
properties = Hash[attrs[:properties].scan(/(\S+)='([^']*)'/)] rescue nil
new(