Dynamically discover init system in the cloudinit script. #2359

Merged
merged 6 commits into from May 19, 2015

Conversation

Projects
None yet
2 participants
Contributor

ericsnowcurrently commented May 19, 2015

(fixes https://bugs.launchpad.net/juju-core/+bug/1450092)

Keying off the juju version doesn't work well for local provider. This patch resolves the issue by adding discovery to the cloudinit script.

(Review request: http://reviews.vapour.ws/r/1595/)

Contributor

ericsnowcurrently commented May 19, 2015

$$merge$$

Contributor

jujubot commented May 19, 2015

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

Contributor

jujubot commented May 19, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/3302

Contributor

ericsnowcurrently commented May 19, 2015

$$merge$$

Contributor

jujubot commented May 19, 2015

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

jujubot added a commit that referenced this pull request May 19, 2015

Merge pull request #2359 from ericsnowcurrently/fix-1450092-cloudinit…
…-init-system-detection

Dynamically discover init system in the cloudinit script.

(fixes https://bugs.launchpad.net/juju-core/+bug/1450092)

Keying off the juju version doesn't work well for local provider. This patch resolves the issue by adding discovery to the cloudinit script.

(Review request: http://reviews.vapour.ws/r/1595/)

@jujubot jujubot merged commit 01bd454 into juju:1.24 May 19, 2015

bz2 pushed a commit to bz2/juju that referenced this pull request May 19, 2015

Revert pr #2359 due to cloud-init breakage
This change to doing init system discovery at cloud-init time
breaks deployment and windows tests.

This reverts commit 01bd454, reversing
changes made to 788839e.

jujubot added a commit that referenced this pull request May 19, 2015

Merge pull request #2367 from bz2/revert_pr2235
Revert pr #2359 due to cloud-init breakage

This change to doing init system discovery at cloud-init time
breaks deployment and windows tests.

This reverts commit 01bd454, reversing
changes made to 788839e.

(Review request: http://reviews.vapour.ws/r/1727/)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment