Fix getting status for OS-provisioner #359
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
katyafervent
force-pushed
the
fix-resizing
branch
from
ba354b1
to
83999d1
Compare
katyafervent
force-pushed
the
fix-resizing
branch
2 times, most recently
from
a927461
to
7cae473
Compare
katyafervent
force-pushed
the
fix-resizing
branch
from
7cae473
to
438cfce
Compare
naumvd95
suggested changes
Sep 21, 2018
| @@ -822,7 +824,7 @@ def shrink(self, *, resources, remove_hostnames): | |||
| return resources | |||
|
|
|||
| def _get_userdata(self): | |||
| docker_bip = {"bip": self.meta["docker_bip_network"]} | |||
| docker_bip = {"bip": self.cluster.metadata.get("docker_bip_network", "10.13.0.1/16")} | |||
There was a problem hiding this comment.
if u want to define "10.13.0.1/16" as sane default, please define it in kqueen config base.py
| @@ -756,6 +754,10 @@ def deprovision(self, volume_names): | |||
| self.c.remove_router_interface(router, port_id=i.id) | |||
| time.sleep(2) | |||
| self.c.delete_router(router.id) | |||
| logger.debug("Router {0} has been deleted".format(self.stack_name)) | |||
| if "resources" not in self.cluster.metadata: | |||
| # Deployment failed before instance spawning | |||
There was a problem hiding this comment.
exception was raised while provisioning, in that case we are handling deprovision of failed deployment
katyafervent
force-pushed
the
fix-resizing
branch
2 times, most recently
from
9760d5c
to
7e3aa7b
Compare
* Also add some improvements to deprovision * Move docker bip setting to config (redefine it only at Mirantis demo config)
katyafervent
force-pushed
the
fix-resizing
branch
from
7e3aa7b
to
c5dbf59
Compare
naumvd95
approved these changes
Sep 25, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.