Commit Graph

42 Commits

Author SHA1 Message Date
Takashi Kajinami d1401c48ad Support image property protections configuration
This allows users to configure the image property protections
feature[1] using this module.

[1] https://docs.openstack.org/glance/latest/admin/property-protections.html

Closes-Bug: 2036732
Change-Id: I3b985b2b280e6d2b678078f4430db02dccca657c
2024-01-03 11:05:00 +09:00
Takashi Kajinami 50e67be163 Stop reading keystone_authtoken options
Using credentials in keystone_authtoken options for glance_* resources
was deprecated some cycles ago[1].

[1] 17cc71c509

Change-Id: I57a2ecc763ccac52d9122afa86871ad74bca7450
2023-11-16 15:26:30 +09:00
Takashi Kajinami 7b9c00a1d2 Replace mocha by rspec-mocks
puppetlabs_spec_helper recommends rspec-mocks instead of mocha[1] and
it uses rspec-mocks by default instead of mocha since v 5.0.0[2]

This is the prep work to adapt to that migration.

[1] https://github.com/puppetlabs/puppetlabs_spec_helper/#mock_with
[2] 493f0cbc1c

Closes-Bug: #2004135
Change-Id: I3c6ee8bb85efcb2169a0248ce11e750991799d63
2023-01-30 13:32:08 +09:00
Takashi Kajinami 188caa864e Fix wrong test description
The value with a white space should be accepted instead of being
rejected. This change fixes the wrong test case description and makes
sure the description explains what is actually tested.

Change-Id: I0fd5b3f5020a5de5c749679b30ad0e8e588c8a49
2022-07-15 11:41:52 +09:00
Takashi Kajinami 1473037e7f Add support for rootwrap.conf
Change-Id: Ib28c3f1a8b46c439a16874c5695f121bf63c3bb9
2022-07-11 14:22:58 +00:00
Takashi Kajinami 27a2efbd04 Remove handling of 'u' prefix
... because the prefix is no longer printed in Python 3.

In python 2
>>> print({u'foo': u'baa'})
{u'foo': u'baa'}
>>> print([u'foo', 'baa'])
[u'foo', 'baa']

In python 3
>>> print({u'foo': u'baa'})
{'foo': 'baa'}
>>> print([u'foo', 'baa'])
['foo', 'baa']

Change-Id: I21de3254caad3cf1805e41faa2ac8d458e61acbe
2022-05-18 10:49:40 +09:00
Takashi Kajinami aaa352a3af Support more file backend parameters
This change improves coverage of the file backend parameters. Because
the filesystem_store_datadirs parameter is MultiStrOpt, support for
MultiStrOpt is also introduced to the glance_cache_config resource
type.

Change-Id: I5785605bf4224c0f189fd7700d5a9b05def058e8
2022-02-13 01:28:44 +09:00
Takashi Kajinami 49c562d390 Load libraries in a single place
This change refactors how the dependent libraries are loaded during
unit tests, and load the libraries in the base spec_helper to avoid
duplicate and redundant implementations.

Change-Id: I92ba82bfba4ab4e47e0f704ea71433cd98fc03d2
2021-12-27 10:37:07 +09:00
Takashi Kajinami 983f6199d4 glance_image: Add support for project_id/name
This change adds the new project_id/name attribute to the glance_image
resource type, so that users can customize owner of glance images
managed by the resource.

Change-Id: I79c231d857079896bf101408aa758ef056669585
2021-11-25 18:45:46 +09:00
Takashi Kajinami 6488c46733 glance_image: Fix handling of image_tag
The image_tag attribute corresponds to the tags key in openstack CLI.
This change updates the key to parse CLI output accordingly.

Change-Id: I97e3eac6ff2fc34a8471f047160f8c14981bf232
2021-11-25 08:54:22 +09:00
Takashi Kajinami 10872d13eb Add support for MultiStrOpt
This replaces the provider implementation of glance_api_config type
so that MultiStrOpt, which is used by several options like
 - oslo_messaging_notifications/driver
 - oslo_policy/policy_dirs
is handled correctly.

Change-Id: I6c0ea1276d16722c9908a20333890a4a17404b61
2021-05-08 12:02:31 +09:00
Thomas Goirand 36e09b4bb2 Add support for glance_api_uwsgi_config in Debian
This patch is adding the configuration of the number of workers,
threads, and the size of the listen queue in Debian, which uses
uwsgi to run Glance API. Therefore, this patch adds a new
glance_api_uwsgi_config provider as well as a new
glance::wsgi::uwsgi class.

Change-Id: If02def38d583f2255b8a0219dc53c26f0980521c
2021-04-09 23:43:59 +02:00
Takashi Kajinami 2ae1115e42 Clean up remaining items for glance-registry
This change drops remaining items about support for glance-registry.
These were deprecated by the removal patch[1] which was merged during
the previous cycle thus we are now ready to drop them.

[1] 11599ba429

Change-Id: If2d371a372cf4d95d84e3d71fb4ce272565ac659
2021-03-17 07:41:23 +09:00
Takashi Kajinami 10a9cbe4d7 Use anchor to require necessary packages/services
... so that correct packages and services are required according
without re-defining them in resource implementations.

Change-Id: I03016890692b406ca86750d7ec8b3b3e1d276b1a
2020-05-04 02:15:52 +09:00
Takashi Kajinami 066f45758d Fix broken Puppet::Provider::Glance
This patch fixes Puppet::Provider::Glance, broken because it still
depends on glance_store/os_region_name, which was removed in [1].

This patch also updates outdated provider implementation, and introduce
the implementetion consisntent with other modules like puppet-nova or
puppet-neutron.

[1] 9e82f598ad

Closes-Bug: #1872656
Closes-Bug: #1872691
Change-Id: I1dfcb311c10c633788c24484c21277255b60e4e5
2020-04-15 12:53:40 +09:00
yatinkarel 1365358978 Fix properties in glance_image provider for osc >= 4.0.0
Similar to I6a68505d15473b140c85a199a09d2fee45864800

Openstackclient 4.0.0 changed the way some properties are displayed
on screen.

Old:
...,"Properties"
...,"foo='bar'"

New:
...,"Properties"
...,"{u'foo': u'bar'}"
or
...,"{'foo': 'bar'}"

This is breaking idempotency on the glance_image provider, since it
does not detect them correctly. This patch aims at fixing this, by
trying to detect the new format, and using JSON parsing in that case.

Change-Id: I1829c7e59058fa72690dc08b3e2f65afcad7ea46
2019-10-09 21:48:47 +05:30
Tobias Urdin 97c5ff3874 Change keystone v2.0 url to v3
Change-Id: Ic90c6394acad605b4a2172b4993bf32cab3e7c20
2019-02-24 13:01:33 +01:00
PranaliD 091c01b7b8 Enable image import conversion & image output format
Glance image conversion configuration is not enabled by
puppet-glance in glance-image-import.conf.

Adding image_import_plugins & output format parameters to enable
glance image conversion.

Change-Id: I098aa0cabf2518b8861d5b58b885d9bdef54a7f6
Closes-Bug: #1807366
2018-12-10 13:41:53 +05:30
Daniel Pawlik 896f4cebbd Added tag property for glance_image provider class
Change-Id: I1772a231c6e3c8ece7f13ca6935d38e3818d2990
2018-11-14 13:51:11 +00:00
Tobias Urdin f0137bfc94 Fix properties for glance_image provider
There are some changes in Glance where it now does
som calculus on the image and adds these three new
values to the image properties. [1]

This change fixes so we dont update these properties
when we flush or create the glance_image resource.

It also changes the spec acceptance so it tests if
our custom property is there and not the only property.

[1] https://github.com/openstack/glance/blob/master/releasenotes/notes/multihash-081466a98601da20.yaml

Co-Authored-By: Alex Schultz <aschultz@redhat.com>
Change-Id: I7f1245be6c2446f0d4336630e800da3e110f3408
2018-08-15 12:57:17 -06:00
qiaomin 774a89ce0c Replace port 35357 with 5000
Now that the v2.0 API has been removed, we don't have a reason to
include deployment instructions for two separate applications on
different ports.

Change-Id: Ieb132483803085c0e97a3572fc035af3817467af
2018-05-13 00:35:56 +08:00
Denis Egorenko 1123f79809 Drop Glare service from puppet-glance
Glare service is now totally dropped from Glance [1] and now should
be configured only with puppet-glare module.

[1] https://review.openstack.org/#/c/427535/

Change-Id: I695ad518285a92a80dd7a9d5bebd11e804359224
2017-09-20 20:31:08 +00:00
Flavio Percoco b5e0ce81b1 Don't use copy from but download the image locally
Glance's v2 doesn't have support for copy-from. This patch removes that
capability in a backwards compatible way by keeping the parameter and
downloading the image locally first and then uploading it into Glance.

Change-Id: Id475b1204f80062bdd357cf2bd979f757e6573ff
2017-01-04 10:06:20 +01:00
Alfredo Moralejo 3079b7caae Add option id to glance_image
In glance, user can specify the desired id when creating
a new image. This can be convenient for some cases where
users want predictable ids for image, as referencing ramdisk_id
or kernel_id for AMI images.

Change-Id: I7868f2005041dea6ecd63cd601e9244cefd08e5b
2016-05-25 09:26:27 +00:00
Javier Pena 109cda8b24 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
adb0b1d012/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
2016-04-08 19:27:00 +00:00
Michael Polenchuk d0957fb622 Add ability to set properties with glance_image
This change updates the glance_image provider to support the ability to
specify properties for an image.  This change only adds the support for
setting properties. The conversion and update to using the v2 will
require further rework of this provider.

Change-Id: I22b92c5ccd0f77c837e9abe987cee07c7d90867e
Co-Authored-By: Alex Schultz <aschultz@mirantis.com>
2016-04-04 14:57:25 -06:00
Denis Egorenko da8a3aa022 Add Glance Glare API service
In Mitaka Glance v3 was moved to stand alone service [1] - now
it's called Glance Artifacts Repository (Glare).

This patch adds appropriate service managing, package installation,
configuration and related spec tests.

[1] I5b7bd4cdcc5f2a40fc4a5f74bcc422fd700c4fb0

Change-Id: I3371d1d57486e79ccfae565417f2195d3ae66bc9
Closes-bug: #1555697
2016-03-22 18:50:29 +03:00
Mykyta Karpin 7d1c73ba0a spec: Add Unit Tests for glance paste_ini types/providers
Change-Id: Ia6688b80f983c76db5b076eafc842bfe2be4481b
Partial-bug: #1440401
2016-03-09 14:47:48 +03:00
Denis Egorenko c8b7d3319b Use glance-swift conf for swift backend
For working with Swift backend, Glance needs authentication parameters,
which are supplied to Swift when making calls to its storage system.
Glance will use information from the file specified under parameter
swift_store_config_file. When this parameter is set to the same file
(glance-api.conf), we have lot of non-critical errors in glance-api
log, because of 'Invalid format of swift store config'.

The same problem, when we have RadosGW.

Change-Id: I18ee8f68f7ce793d2580685e79ed636556c57ddd
Related-bug: #1540890
2016-02-02 17:34:33 +03:00
gcmalloc 7e2e1162d0 Add support for min ram and min disk
Add min_ram and min_disk properties to the glance_image resource.

Change-Id: I27202559bc73283a318575669c957238f5aee988
2016-01-25 17:54:41 -08:00
Dan Prince bce0eac01c Autorequire correct package based on the distro
Some distros (RHEL based) have a single glance package. On those
distros the ensure_package/autorequire stuff doesn't quite work
correctly as per the type code it is assumed two packages 'glance-api'
and 'glance-registry'

This commit makes sure that on RHEL based distros type only autorequire
'openstack-glance' while on other distros it correctly autorequire
'glance-api' and 'glance-registry'

Change-Id: I17c84b2282beadaec80f4db42fa5696b7967159f
Closes-bug: #1493442
Co-Authored-By: Yanis Guenane <yguenane@redhat.com>
2015-09-09 12:37:30 +02: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
Yanis Guenane d769137e38 Rely on autorequire for config resource ordering
Currently we specify the ordering of config resources wherever it is
necessary based on the presence of the file it will write to, or the
presence of the package in charge of providing the file it will write
to.

Those kind of ordering can be specified directly at the resource level
using the autorequire mechanism. With this patch, any config resource
will make sure the package in charge of providing the file will be
installed first.

Change-Id: Idb19da25958e79787b0c66e4ae275216849a9a2e
2015-08-19 12:41:16 +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 f377c0229c.
- 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 b76fbcbea3.

With 268370457c 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 e2301958e9.

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 354ae692a5.

Change-Id: I65249b0734ae1a1bfbf0e5e153d19787f6aded5f
2015-04-17 17:42:37 -07:00
Javier Pena 354ae692a5 Fix os_region_name in provider
Commit e6e8f6a562 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
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
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