/juju

state: don't force-destroy manual machines #6034

Merged
merged 1 commit into from Aug 19, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @wallyworld @jujubot
@axw
Member

axw commented Aug 19, 2016

When destroying a model, we were force-destroying
all non-manager machines. We should not force-destroy
manual machines, as doing so may lead to applications
being left running on the machine. Instead, just
issue a non-force destroy. If the machine is in a
bad state, the user will have to force-destroy
via "juju remove-machine --force".

Fixes https://bugs.launchpad.net/juju-core/+bug/1475212
@axw
state: don't force-destroy manual machines 
When destroying a model, we were force-destroying
all non-manager machines. We should not force-destroy
manual machines, as doing so may lead to applications
being left running on the machine. Instead, just
issue a non-force destroy. If the machine is in a
bad state, the user will have to force-destroy
via "juju remove-machine --force".

Fixes https://bugs.launchpad.net/juju-core/+bug/1475212
2858aaf
@axw
Member

axw commented Aug 19, 2016

QA

Ran the CI script referred to in https://bugs.launchpad.net/juju-core/+bug/1475212 numerous times in succession: (deploy_job.py ... manual-deploy-trusty-amd64), targeting three LXD machines running Trusty.
@wallyworld
Owner

wallyworld commented Aug 19, 2016

LGTM
@axw
Member

axw commented Aug 19, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Aug 19, 2016

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 5b14cdc into juju:master Aug 19, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment