Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reap instances on openstack provider and destroy storage #411

Merged

Conversation

ajkavanagh
Copy link
Contributor

If a sequence of bundles (e.g. for func) creates storage, if
destroy_storage is not used, then the model (possibly) leaves the
storage behind. This patch enables the destroy_storage feature in
destroy_model() call in python_libjuju.

If a sequence of bundles (e.g. for func) creates storage, if
destroy_storage is not used, then the model (possibly) leaves the
storage behind.  This patch enables the destroy_storage feature in
destroy_model() call in python_libjuju.
@codecov-io
Copy link

codecov-io commented Jan 25, 2021

Codecov Report

Merging #411 (9b4bfdf) into master (7d694ad) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #411   +/-   ##
=======================================
  Coverage   82.20%   82.20%           
=======================================
  Files          29       29           
  Lines        2287     2287           
=======================================
  Hits         1880     1880           
  Misses        407      407           
Impacted Files Coverage Δ
zaza/controller.py 74.54% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7d694ad...9b4bfdf. Read the comment docs.

@ajkavanagh ajkavanagh marked this pull request as ready for review January 26, 2021 10:56
@ajkavanagh ajkavanagh marked this pull request as draft January 26, 2021 13:54
Essentially, the destroy-model with --force (via libjuju) doesn't reap
the instances leading to CI failures if multiple bundles are used as it
relies on proper clean-up of the instances and their vips.

This patch uses the undercloud OpenStack directly to remove the
instances that used to belong to the model that was just destroyed.
Only has an affect on the openstack provider.
@ajkavanagh ajkavanagh changed the title Add option to destroy storage to destroy_model() call Reap instances on openstack provider and destroy storage Jan 27, 2021
@lourot
Copy link
Contributor

lourot commented Jan 27, 2021

@ajkavanagh ajkavanagh marked this pull request as ready for review January 28, 2021 15:37
Copy link
Contributor

@lourot lourot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM in general, thanks!

zaza/utilities/openstack_provider.py Show resolved Hide resolved
zaza/utilities/openstack_provider.py Outdated Show resolved Hide resolved
zaza/utilities/openstack_provider.py Show resolved Hide resolved
zaza/utilities/openstack_provider.py Outdated Show resolved Hide resolved
unit_tests/test_zaza_utilities_openstack_provider.py Outdated Show resolved Hide resolved
openstack-mirroring pushed a commit to openstack/charm-masakari that referenced this pull request Jan 29, 2021
Includes updates to charmhelpers/charms.openstack for cert_utils
and unit-get for the install hook error on Juju 2.9

* charm-helpers sync for classic charms
* rebuild for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure master branch for charms.openstack
  - ensure master branch for charm-helpers

The func test pr is to test/verify the reap instances change in zaza.

func-test-pr: openstack-charmers/zaza#411

Change-Id: I744bd6f88c88ef30754bcf947c5379334b24631a
openstack-mirroring pushed a commit to openstack/openstack that referenced this pull request Jan 29, 2021
* Update charm-masakari from branch 'master'
  to 74a2bc949cff379b2c2427af052468fe43144b51
  - Updates for testing period for 20.01 release
    
    Includes updates to charmhelpers/charms.openstack for cert_utils
    and unit-get for the install hook error on Juju 2.9
    
    * charm-helpers sync for classic charms
    * rebuild for reactive charms
    * ensure tox.ini is from release-tools
    * ensure requirements.txt files are from release-tools
    * On reactive charms:
      - ensure master branch for charms.openstack
      - ensure master branch for charm-helpers
    
    The func test pr is to test/verify the reap instances change in zaza.
    
    func-test-pr: openstack-charmers/zaza#411
    
    Change-Id: I744bd6f88c88ef30754bcf947c5379334b24631a
@lourot
Copy link
Contributor

lourot commented Jan 29, 2021

Travis seems not to pick the last change up, but since it's minor and the previous commit was validating, I'm landing this, thanks!

@lourot lourot merged commit f866e2d into openstack-charmers:master Jan 29, 2021
@ajkavanagh ajkavanagh deleted the destroy-storage-on-model-destory branch January 29, 2021 14:21
coreycb pushed a commit to coreycb/zaza that referenced this pull request Oct 17, 2023
…-octavia-tempest

Add Octavia to Tempest service list
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.

None yet

3 participants