Revert the addition of the cloud-init flag manage_etc_hosts #6465

Merged
merged 1 commit into from Oct 18, 2016

Conversation

Projects
None yet
3 participants
Contributor

dooferlad commented Oct 18, 2016

Reverts most changes in rev e6a7303. Tests have been kept and fixed up because they provide better coverage.

The bug that the above rev fixed (http://pad.lv/1593185) is no longer seen without this flag and that change introduced two new bugs (http://pad.lv/1563271 http://pad.lv/1633126).

Testing performed:

On both the LXD and MAAS providers:

  1. Bootstrap + add machine using LXD provider.
  2. Check that hostname -f produces the correct output.

Just LXD (no Juju):

This show that LXD itself gets this right, so either we stopped breaking something or LXD fixed something:

dooferlad@homework2 ~/dev/jujuWand $ lxc launch ubuntu-xenial
Creating communal-walrus
Starting communal-walrus

dooferlad@homework2 ~/dev/jujuWand $ lxc exec communal-walrus bash
root@communal-walrus:~# hostname -f 
communal-walrus.lxd
Revert the addition of the cloud-init flag manage_etc_hosts
Reverts most changes in rev e6a7303. Tests have been kept and fixed up because they provide better coverage.

The bug that the above rev fixed (http://pad.lv/1593185) is no longer seen without this flag and that change introduced two new bugs (http://pad.lv/1563271 http://pad.lv/1633126).

# Testing performed:
On both the LXD and MAAS providers:

1. Bootstrap + add machine using LXD provider.
2. Check that hostname -f produces the correct output.

@dooferlad dooferlad changed the base branch from staging to develop Oct 18, 2016

Contributor

dooferlad commented Oct 18, 2016

$$merge$$

Contributor

jujubot commented Oct 18, 2016

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

Contributor

jujubot commented Oct 18, 2016

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

Contributor

dooferlad commented Oct 18, 2016

$$merge$$

Contributor

jujubot commented Oct 18, 2016

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

Contributor

jujubot commented Oct 18, 2016

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

Contributor

dooferlad commented Oct 18, 2016

$$merge$$

Contributor

jujubot commented Oct 18, 2016

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

@jujubot jujubot merged commit b03127f into juju:develop Oct 18, 2016

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