Skip to content

Cherry picks/stable/train#731

Merged
ajkavanagh merged 2 commits intoopenstack-charmers:stable/trainfrom
gnuoy:cherry-picks/stable/train
Mar 25, 2022
Merged

Cherry picks/stable/train#731
ajkavanagh merged 2 commits intoopenstack-charmers:stable/trainfrom
gnuoy:cherry-picks/stable/train

Conversation

@gnuoy
Copy link
Copy Markdown
Contributor

@gnuoy gnuoy commented Mar 25, 2022

Cherry picks of:

29b569d (Use yaml.safe_load())
bf6b466 (Use snapshot_support=True for manila share type)

freyes and others added 2 commits March 25, 2022 12:36
Pyyaml>=6.0 requires to pass the Loader arg to yaml.load(), switching to
yaml.safe_load() recovers the old and expected behavior.

yaml/pyyaml#561

Closes-Bug: #1951650
The extra specs of a manila share type need to match the
share service's capabilities. [1]

[1] https://docs.openstack.org/manila/pike/admin/shared-file-systems-troubleshoot.html#id2

Closes-Bug: #1962204
@ajkavanagh ajkavanagh merged commit a235c1a into openstack-charmers:stable/train Mar 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants