Last commit made on 2019-04-10
Get this branch:
git clone -b stable/rocky

Branch merges

Branch information


Recent commits

cc0b19a... by Ian Wienand on 2019-04-10

Merge "Replace git:// URLs with https://" into stable/rocky

ec2969d... by Abhishek Kekane on 2018-11-15

Failure in web-dowload kept image in importing state

As of now if import using web-download method fails due to invalid
uri, image remains in 'importing' state. As the image is in 'importing'
state it is not of any use to end-user.

Resetting it to queued state, so that user can try again uploading/importing
data to the same image.


Change-Id: Iaa26922a9cf5a419c3da23bdfc347a6fdf6cb549
Closes-Bug: #1803299
(cherry picked from commit 94d3a0a14d574589f8d45c788a6f896cbcc09f41)

d0117ff... by Ian Wienand on 2019-03-24

Replace git:// URLs with https://

This is a mechanically generated change to replace
git:// URLs with https:// equivalents.

This is in aid of a planned future move of the git hosting
infrastructure to a self-hosted instance of gitea (,
which does not support the git wire protocol at this stage.

This update should result in no functional change.

For more information see the thread at

Change-Id: Iba8854910eebbfe8a36fa56c2e68c7ec41632f48

8c3751d... by Abhishek Kekane on 2019-03-13

Data remains in staging area if 'file' store is not enabled

When operator has not enabled 'file' store and using other stores like ceph,
swift etc. the uploading to staging area works as we explicitly
build 'file' store during this operation, while cleaning up we directly
use 'glance_store.delete_from_backend' which only works if 'file'
store is enabled.

Modified '_DeleteFromFS' task and _unstage call which will use os
module to unlink the file present in staging area explicitly to
delete the data from staging area.


NOTE: Renamed import statement from above test files as async_
module is not available in stable/rocky.

Closes-Bug: #1803498
Change-Id: If0b3b0af9300301291758c67267890e0959ebb3c
(cherry picked from commit c92724608512d42b56152d199cc0fea049e4d4a7)

893d337... by Zuul <email address hidden> on 2019-02-14

Merge "Removed glancecachemanage.rst and updated header.txt." into stable/rocky

206deb9... by Zuul <email address hidden> on 2019-01-23

Merge "py3: fix recursion issue under py37" into stable/rocky

f126d3b... by Illia Khomenko on 2018-12-07

Removed glancecachemanage.rst and updated header.txt.

Removed glancecachemanage.rst because the glance-cache-manage
command was removed. Updated Date and Version in the header.txt
to correct values.

Partial-bug: #1799491
Change-Id: Ia5746be2ace446bc3ed316426c5a5a9b15ec24d1

f3a584f... by Abhishek Kekane on 2018-11-29

Image conversion fails

It is not possible to convert glance images as it fails with error,
NoSuchOptError: no such option 'conversion_plugin_options' in group
[DEFAULT] as there is no 'conversion_plugin_options' option or group
in glance-image-import.conf file.

Used correct option group 'image_conversion' to fetch the image
'output_format' option.

Change-Id: Ia7ced170bcddcd3639b7edfb644deef3018b11a8
Closes-Bug: #1805765
(cherry picked from commit 8ee37b7d7ca7d5d2d5e8ef2adc61306f3b57a0a2)

92fb3c1... by Brian Rosmaita on 2018-12-21

Correct typo in config option choices

A typo in the oslo.config 'choices' for the output_format config
option definition for the image conversion plugin in the
interoperable image import workflow prevents conversion to the
vmdk format. This patch corrects the typo and regenerates the
sample image import conf file.

Change-Id: I1836a46d969aab8ce09967db63d66f215d2cc920
Closes-bug: #1809462
Related-bug: #1805765
(cherry picked from commit a22f02b653399bc495b85db1d6106c0e790edfe7)

d2bb38d... by Brian Rosmaita on 2018-12-20

Update show_multiple_locations deprecation note

Update logged text to indicate our intentions with respect
to the show_multiple_locations configuration option, which
has been deprecated since Newton and advertised as subject
to removal in Pike. Also correct the misleading impression
in the deprecation notice and earlier release notes that
functionality that requires show_multiple_locations = True
can be configured via policies at the current time. Also
adds a release note to this effect.

Not a straight cherry-pick. Changed the section of the
relase note from 'upgrade' to 'issues' because this is more
of a "known issue" in the stable branches.

Change-Id: I5bf0c8af9dfe87e0d17f7a16d4676f387b4379f6
Closes-bug: #1808375
(cherry picked from commit de72ac4a01be1ccc75825eb941dad64c170d6bea)