/juju

Allow client to work on any Linux #6261

Merged
merged 4 commits into from Sep 16, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@mjs @jujubot
@mjs
Contributor

mjs commented Sep 15, 2016 •
Edited 1 time

This fixes https://bugs.launchpad.net/juju/+bug/1616531.

There are several parts to the change:

  1. The juju/utils dependency has been updated so pull in the os.Arch -> os.GenericLinux change.
  2. References to Arch (Arch Linux) constant have been replaced with GenericLinux.
  3. The Azure provider no longer pretends to support Arch Linux instances in one area.
  4. When using local tools, bootstrap will allow the client running on any Linux to bootstrap any Ubuntu or Centos series. Previously it was only possible for an Ubuntu client to bootstrap an Ubuntu controller or a Centos client to bootstrap a Centos controller.

QA

Using local tools, bootstrapped:

  • xenial controller using fedora client
  • trusty controller using fedora client
  • xenial controller using xenial client
  • trusty controller using xenial client
  • xenial controller using arch client
  • xenial controller using debian client

Also confirmed that bootstrapping with --agent-version=2.0-beta18 works from:

  • xenial
  • fedora
@mjs
provider/azure: Don't attempt to handle Arch Linux 
We don't support Arch Linux instances so there's no need to expect them
here.
27f64cd
@mjs
Contributor

mjs commented Sep 16, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Sep 16, 2016

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

jujubot commented Sep 16, 2016

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

mjs added some commits Sep 15, 2016

@mjs
Bump juju/utils dependency 
To get GenericLinux support.
c7028b3
@mjs
environs/bootstrap: Relaxed Linux bootstrapping 
When using local tools, it is now possible to bootstrap a controller of
any supported Linux series, when the client is running on any Linux (of
the same architecture). Previously, an Ubuntu client could only
bootstrap Ubuntu controllers, a CentOS client could only bootstrap
Centos controllers and a client running on any other Linux couldn't
bootstrap with local tools at all.

This concludes the fix for https://bugs.launchpad.net/juju/+bug/1616531
a23378f
@mjs
Adjust tests: os.GenericLinux replaces os.Arch
fa1303f
@mjs
Contributor

mjs commented Sep 16, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Sep 16, 2016

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

@jujubot jujubot merged commit 6399c63 into juju:master Sep 16, 2016

@mjs mjs deleted the mjs:1616531-fedora-panic branch Sep 16, 2016

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