29 Commits

Author SHA1 Message Date
Emilien Macchi
7147ba0323 glance_image: hardcode os-image-api-version to 1
Glance_image provider is using 'openstack image create' operation to
create an image.
This operation is supported by glanceclient but not in openstackclient.
Since openstackclient recently switched the default image-api-version to
2, we need to hardcode the version when using this operation so we can
still create images with openstackclient.

See https://bugs.launchpad.net/python-openstackclient/+bug/1405562

Closes-Bug: 1497385
Change-Id: I68adf3fb5c983f37b4b80171466928f6b94a0f6d
2015-09-18 15:54:36 -04:00
Yanis Guenane
8db8143c89 Reflect provider change in puppet-openstacklib
With the creation of the new openstack_config provider, some processing
that was done in glance_api_config has been centralized in
openstack_config.

The same changes apply for glance_registry_config and
glance_cache_config

Impacted methods are :

  * section
  * setting
  * separator

Also, this commit adds the fact that, when passing a specific string
(ensure_absent_val) the provider will behave as if ensure => absent was
specified. '<SERVICE DEFAULT>' is the default value for
ensure_absent_val.

The use case is the following :

glance_api_config { 'DEFAULT/foo' : value => 'bar' } # will work as usual

glance_api_config { 'DEFAULT/foo' : value => '<SERVICE DEFAULT>' } # will mean absent

That means that all the current :

if $myvar {
  glance_api_config { 'DEFAULT/foo' : value => $myvar }
} else {
  glance_api_config { 'DEFAULT/foo' : ensure => absent }
}

can be removed in favor of :

glance_api_config { 'DEFAULT/foo' : value => $myvar }

If for any reason '<SERVICE DEFAULT>' turns out to be a valid value for
a specific parameter. One could by pass that doing the following :

glance_api_config { 'DEFAULT/foo' : value => '<SERVICE DEFAULT>',
ensure_absent_val => 'foo' }

Change-Id: I3bbdf63d1b9b5a2daba30fd4ba897db703f979ae
Depends-On: I0eeebde3aac2662cc7e69bfad7f8d2481463a218
2015-08-19 12:42:38 +02:00
Colleen Murphy
39b58df7a8 Use OpenstackClient for glance_image auth
This patch changes the glance_image provider to use
puppet-openstacklib's authentication methods, which use
python-openstackclient as an interface, instead of the glance command
line client. The benefits of this is:

- Code reduction. This patch reduces the amount of code in the
  glance parent provider and glance_image provider by reusing code from
  Puppet::Provider::Openstack instead of implementing authentication,
  retries, and response parsing in the provider.
- Presumed reduction in sudden API changes that require quick fixes in
  this module, such as f377c0229c006b02f43a14be4979553e983cb98e.
- Ability to set project-based access control for images

Additional reasoning for this change is in the blueprint.

Important note: this change does not work on Ubuntu under Juno due to a
major bug in the version of python-openstackclient shipped in UCA [1].
This change targets the Kilo releases.

Note about performance: the self.instances and instances methods make
API requests for each image found in the list of instances. This is not
a change from how this was implemented before. The --long formatted
list, either from the glance client or openstackclient, does not
provide all information needed to query an instance and populate
setters. Future patches could possibly improve on this.

Other details of this change:

- Removes auth_glance method, replaced by the request and
  glance_request methods
- Removes auth_glance_stdin method which was not being used
- Removes parse_table which is now unnecessary because openstackclient
  formats its responses as CSV and Puppet::Provider::Openstack#request
  returns the results a hash
- Removes remove_warnings methods which are handled by
  Puppet::Provider::Openstack#request
- Removes list_glance_images and get_glance_image_attr which are
  sufficiently replaced by using the 'list' and 'show' commands with
  Puppet::Provider::Openstack's request method.
- Removed self.prefetch since we can't populate auth parameters during
  a prefetch. Instead we prepopulate the list via the instances method.
- Added a flush method to do updates more efficiently
- Changed is_public property to accept true/false in addition to yes/no
  and to munge to a symbol instead of a capitalized string, for
  consistency with keystone_tenant's enabled property
- Move the reset method into the spec tests since it is only necessary
  for testing
- Added tests for glance_image, which did not exist before
- Removed connection retry test since this is taken care of in
  openstacklib

[1] https://bugs.launchpad.net/python-openstackclient/+bug/1269821

blueprint use-openstackclient-in-module-resources

Change-Id: Iceab5e1c6138e7aba0f883ed4acb8f7ecbcd2830
2015-06-29 17:35:23 -07:00
Colleen Murphy
378523be43 Revert "glance provider: pick os_region_name from DEFAULT"
This reverts commit b76fbcbea34b510191964cc3ed6a4c8e6f2acbfe.

With 268370457c118e62b93990cea31066c477ab0dbc now merged, we need to go
back to looking for os_region_name in [glance_store] instead of
[DEFAULT].

Change-Id: I197d012387d630ca6fb3a38c48f0603add6c6de1
2015-06-22 17:18:12 -07:00
Emilien Macchi
b76fbcbea3 glance provider: pick os_region_name from DEFAULT
In ::glance::api, os_region_name is set in DEFAULT which work for both
Juno & Kilo.

'glance_store' section has been introduced in Kilo which breaks Juno.
Until we decide our policy to manage master, let's use DEFAULT so both
releases work well.

Change-Id: I1c519146d3fe62f8c8fc8c2d85805db11af21e4c
2015-04-24 16:13:55 -04:00
Colleen Murphy
62c42a5f61 Revert "Revert "Fix os_region_name in provider""
Depends on https://review.openstack.org/#/c/174969/

This reverts commit e2301958e9dd4086fb6f5689499e5bb39e87e208.

Change-Id: I86db306b90cfdba53cf40bd9e3b2cce453e821d0
2015-04-17 17:43:49 -07:00
Colleen Murphy
e2301958e9 Revert "Fix os_region_name in provider"
When we revert the change that moved os_region_name, we must also
revert this fix that resulted from that change.

Depends on https://review.openstack.org/#/c/174968/

This reverts commit 354ae692a502a6089f4f82b3b58ee2aaa42443a2.

Change-Id: I65249b0734ae1a1bfbf0e5e153d19787f6aded5f
2015-04-17 17:42:37 -07:00
Javier Pena
354ae692a5 Fix os_region_name in provider
Commit e6e8f6a56231409028ff1e7cdcd44781ca37d5b0 changed the section
where the os_region_name setting is placed from 'DEFAULT' to
'glance_store'. However, the provider was not updated to reflect
this change, so it broke.

Change-Id: I9e91faac2a45ac4eba4cc27c328e8dc67e619ab3
2015-04-16 18:39:08 +02:00
Colleen Murphy
1d0a8ba83d Change location to be a param, not a property
The location property of the glance_image type has nearly identical
functionality as the source param, yet one is a param and one is a
property. It is possible to change either of these for a glance image,
but only if it is as of yet unset, and therefore unsaved. It is not
possible to change the location of a glance image once it has been
saved, nor is it possible to query it afterward. Since having location
be a property when it is usually unsettable and is always unqueryable
does not make much sense, we change it to be a param to be consistent
with the source param.

Change-Id: I686c3fec9bf571d18e282888c626d795c9958a6b
2015-04-10 15:18:34 -07:00
Javier Pena
9f44421ceb Support identity_uri in provider
After https://review.openstack.org/152321 was merged, it was no
longer guaranteed that some now deprecated settings like auth_host
and auth_protocol would be present in glance-api.conf. This breaks
the Glance provider, which expects them to be present.

This patch adds support for identity_uri in provider, while
keeping backwards compatibility.

Change-Id: Ie8a2e45a4afea4828e02af36e64d65e7d4b7557e
2015-03-03 16:42:09 +01:00
Javier Pena
90bf62341d Fix glance_image for local images
When trying to upload an image from the local file system, the
resource provider was failing. Fixing it to use the --file option
for the glance client instead of going through stdin.

Change-Id: Ic6bade025d28e2eb33f86c2d4421b65d06e8274c
2014-11-05 11:06:47 +01:00
Jan Kundrát
abd028a5f6 Run the glance CLI tool with appropriate region name
This is pretty important in situations where Keystone contains information about
multiple regions. The holding assumption is that the glance::image etc are used
for image upload for the current region.

Change-Id: I0a24cd24ddf3e0b1fab94e693a2fac847cc7271c
2014-10-09 16:27:37 +02:00
Emilien Macchi
f377c0229c Update deprecated Glance CLI
Since this patch has been merged in python-glanceclient 0.14.1:
1dfce5301c

We have to update the way to call Glance Client.
This patch updates for glance image-list, image-show and the way to get
a token, and also the way the glance command output is parsed.

Change-Id: If3e1e42b1245dd064fa00e07037535afc9caa04c
2014-10-01 18:27:17 +02:00
Ivan Chavero
0adbbcf9f4 Fixes wrong values in get_glance_image_attrs
The output of the glance show command in get_glance_image_attrs
does not get properly converted while being added to the
attrs array.

Change-Id: Ibe503b24ae3bfa10944537d5deaa068a01eaa5f3
Closes-Bug: #1199513
2014-05-04 10:14:17 -06:00
Chris Hoge
d8d951f328 Fixed the Glance add_image parser for new client
The python-glanceclient (glance) was updated to not report back
on the id of an uploaded image with the v2 API [1].  This broke
the parser for the glance_image provider. This change first checks
for the previous behavior (for performance and backwards
compatability), and failing that parses the results table and
pulls the id (if it exits) out of the results.

The new parse_table method was made to be generic so that any result
from the glance client could be parsed into an array of maps.

[1]
https://github.com/openstack/python-glanceclient/search?q=Added+new+image+with+ID&ref=cmdform

Change-Id: If7b5445c6f51d886427248827a73cc16b5a2e488
2014-04-30 09:13:06 -07:00
Emilien Macchi
cea9f69ad5 Update glance_image provider with API v2
Some arguments are deprecated in API v2.
This patch aims to update glance_image provider to fit with the
OpenStack Images API v2.0 (latest stable).

Note: Glance API v2 is by default from OpenStack Folsom release.

Change-Id: Ic06a839324aa0a6e11b16a13ad8927a1da6e13e4
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2014-03-17 11:06:32 +00:00
Martin Magr
9bc8d08681 Use remove_warnings from puppet-keystone
Glance client is getting the same warnings as Keystone client,
hence puppet-glance should use the same hack as puppet-keystone
until providers will be refactored to use API calls instead.

See https://bugzilla.redhat.com/show_bug.cgi?id=1043725 for more details

Change-Id: I99e4308d0731307c019ad6cab8db5feee1b0ed73
2014-02-12 10:50:27 +01:00
Mark T. Voelker
986dfaa3c0 Remove --silient-upload option, which is invalid
Python-glanceclient removed the --silent-upload some time ago (I
believe when the client was split out from Glance itself).  It's no
longer valid and needs to be removed.  Otherwise users will see
an error of the form:

glance: error: unrecognized arguments: --silent-upload

Change-Id: I417688872bd8e7c4bac7be13d0b0eb13a030fe29
2013-07-29 13:57:18 -04:00
Dan Bode
850bca13c7 Glance provider should retry once when service is not ready
Just b/c the glance service has started correctly does not
mean the service is actually running. Often, the service
is not operational and attempts to use the glance_image provider
results in connection errors.

This commit inserts code that allows the glance provider to
sleep for 10 seconds and perform a single retry.

The template for the code and tests was borrowed from keystone.

Change-Id: I565f1befea6ec3d2347f8e29c9aa05d5a312a827
2013-07-09 00:26:26 -07:00
Simon Sellar
bf4fe406aa Check if auth_admin_prefix is defined
Check if auth_admin_prefix is defined (passed as a parameter to api.pp)
before trying to access it in the settings data structure.

Change-Id: I61a3ae41dca2a5e5bd9e635b0a2ab9eb05b0326a
Fixes: bug #1190481
2013-06-14 09:35:18 +09:30
François Charlier
dc98e9bb58 Add support for auth_admin_prefix in glance
Add support for auth_admin_prefix in glance::registry, glance::api & in
the glance provider.

Change-Id: I646c621f0a42cd987bc409b17066f8ac13556883
2013-06-11 17:26:28 +02:00
Dan Bode
7cbd4bbf8c changes required to support purging
In order for the ini file type to support purging,
the file path must be accessible on the class instance.

This patch was made to test some new functionality being added
to the inifile type
  https://github.com/cprice-puppet/puppetlabs-inifile/pull/25

It does effect backwards compat of this native type so its ok
to go ahead and merge.
2013-03-04 16:03:58 -08:00
Dan Bode
9a76656774 refactor of glance_image
This commit introduces a refactor of glance_image.

ensure that it follows the best practices for provider development.
- use property hash
- use mk_resource_methods
- update property hash on create and delete.

ensure that it keeps it property hash reasobly up to date.
2013-02-20 14:16:03 -08:00
Dan Bode
cc86b4592d do not add quotes to image name
previously, quotes were being added to the image name.

this caused the type to not be idempotent.
2013-02-15 16:02:04 -08:00
Aimon Bustardo
567bf0863e Move from parsing glance-api-paste.ini to glance-api.conf 2012-11-11 14:11:26 -08:00
Dan Bode
ee38ea961e Properly load parent provider from another module
As recommended by lak.
2012-10-10 12:59:45 -07:00
Dan Bode
db7de69bd5 Convert to ini file management
- Add native types to manage all existing ini files
- remove all unused templates
- convert all concat with ini_setting resources
- remove all concat code
2012-10-03 22:04:00 -07:00
Joe Topjian
69ffc7424e Slight changes. 2012-08-04 12:38:29 -06:00
Joe Topjian
242a424561 First attempt at creating a glance_image type 2012-08-04 02:46:37 -06:00