08ee5866a6
This patch changes the nova providers to use puppet-openstacklib's authentication methods, which use python-openstackclient as an interface, instead of the nova command line client. The benefits of this is a code reduction. This patch reduces the amount of code in the nova parent provider and nova providers by reusing code from Puppet::Provider::Openstack instead of implementing authentication, retries, and response parsing in the provider. This patch doesn't affect next providers: * nova_network and nova_floating: openstack client has small functionality for managing nova floatings and doesn't provide possibility to manage nova-networks, so keeping old format of auth for this providers. Also Nova-Network is deprecated. * nova_cell: openstack client doesn't provide possibility to manage cells; * nova security groups - will be done in separate patch; Additional reasoning for this change is in the blueprint. Also added new tests for providers. blueprint use-openstackclient-in-module-resources Change-Id: Ifa09aeb71ba0bcc425eece314803a0d1609bed9f
108 lines
3.2 KiB
Ruby
108 lines
3.2 KiB
Ruby
require 'puppet/provider/nova'
|
|
|
|
Puppet::Type.type(:nova_aggregate).provide(
|
|
:openstack,
|
|
:parent => Puppet::Provider::Nova
|
|
) do
|
|
desc <<-EOT
|
|
Provider to manage nova aggregations
|
|
EOT
|
|
|
|
@credentials = Puppet::Provider::Openstack::CredentialsV2_0.new
|
|
|
|
mk_resource_methods
|
|
|
|
def self.instances
|
|
request('aggregate', 'list').collect do |el|
|
|
attrs = request('aggregate', 'show', el[:name])
|
|
new(
|
|
:ensure => :present,
|
|
:name => attrs[:name],
|
|
:id => attrs[:id],
|
|
:availability_zone => attrs[:availability_zone],
|
|
:metadata => str2hash(attrs[:properties]),
|
|
:hosts => string2list(attrs[:hosts]).sort
|
|
)
|
|
end
|
|
end
|
|
|
|
def self.string2list(input)
|
|
return input[1..-2].split(",").map { |x| x.match(/'(.*?)'/)[1] }
|
|
end
|
|
|
|
def self.prefetch(resources)
|
|
instances_ = instances
|
|
resources.keys.each do |name|
|
|
if provider = instances_.find{ |instance| instance.name == name }
|
|
resources[name].provider = provider
|
|
end
|
|
end
|
|
end
|
|
|
|
def exists?
|
|
@property_hash[:ensure] == :present
|
|
end
|
|
|
|
def destroy
|
|
@property_hash[:hosts].each do |h|
|
|
properties = [@property_hash[:name], h]
|
|
self.class.request('aggregate', 'remove host', properties)
|
|
end
|
|
self.class.request('aggregate', 'delete', @property_hash[:name])
|
|
end
|
|
|
|
def create
|
|
properties = [@resource[:name]]
|
|
if not @resource[:availability_zone].nil? and not @resource[:availability_zone].empty?
|
|
properties << "--zone" << @resource[:availability_zone]
|
|
end
|
|
if not @resource[:metadata].nil? and not @resource[:metadata].empty?
|
|
@resource[:metadata].each do |key, value|
|
|
properties << "--property" << "#{key}=#{value}"
|
|
end
|
|
end
|
|
@property_hash = self.class.request('aggregate', 'create', properties)
|
|
|
|
if not @resource[:hosts].nil? and not @resource[:hosts].empty?
|
|
@resource[:hosts].each do |host|
|
|
properties = [@property_hash[:name], host]
|
|
self.class.request('aggregate', 'add host', properties)
|
|
end
|
|
end
|
|
end
|
|
|
|
def availability_zone=(value)
|
|
self.class.request('aggregate', 'set', [ @resource[:name], '--zone', @resource[:availability_zone] ])
|
|
end
|
|
|
|
def metadata=(value)
|
|
# clear obsolete keys
|
|
# wip untill #1559866
|
|
# if @property_hash[:metadata].keys.length > 0
|
|
# properties = [@resource[:name] ]
|
|
# (@property_hash[:metadata].keys - @resource[:metadata].keys).each do |key|
|
|
# properties << "--property" << "#{key}"
|
|
# end
|
|
# self.class.request('aggregate', 'unset', properties)
|
|
# end
|
|
properties = [@resource[:name] ]
|
|
@resource[:metadata].each do |key, value|
|
|
properties << "--property" << "#{key}=#{value}"
|
|
end
|
|
self.class.request('aggregate', 'set', properties)
|
|
end
|
|
|
|
def hosts=(value)
|
|
# remove hosts, which are not present in update
|
|
(@property_hash[:hosts] - @resource[:hosts]).each do |host|
|
|
properties = [@property_hash[:id], host]
|
|
self.class.request('aggregate', 'remove host', properties)
|
|
end
|
|
# add new hosts
|
|
(@resource[:hosts] - @property_hash[:hosts]).each do |host|
|
|
properties = [@property_hash[:id], host]
|
|
self.class.request('aggregate', 'add host', properties)
|
|
end
|
|
end
|
|
end
|