F/show cloudregion juju models #6485

Merged
merged 6 commits into from Oct 21, 2016

Conversation

Projects
None yet
3 participants
Contributor

reedobrien commented Oct 21, 2016

This changes the juju models output to output cloud/region in place of the Owner column.

QA:

  1. Run unit tests and the all pass
  2. bootstap a controller
  3. add another model in another region,
  4. juju models
Controller: reed/aws/us-west-1

Model       Cloud/Region       Status     Machines  Cores  Access  Last connection
controller  awstest/us-west-1  available         1      2  admin   just now
default     awstest/us-west-1  available         0      -  admin   1 hour ago
east1*      awstest/us-east-1  available         0      -  admin   6 minutes ago

Michael Foord and others added some commits Oct 18, 2016

Merge pull request #6475 from voidspace/vsphere-ipv6
Derive address scope instead of setting it explicitly in vsphere

Fixes bug #1629452
https://bugs.launchpad.net/juju/+bug/1629452 

Change the vsphere provider to use derived scope for all addresses instead of explicitly setting an incorrect public scope.

The vsphere provider has no infrastructure for configuring fake instances, so it's not possible to unit test this change. All existing unit tests pass though.

QA steps
Bootstrap to vsphere
Deploy Ubuntu units on xenial
Se that the units get IPv4 addresses and you can ssh to them.
Contributor

reedobrien commented Oct 21, 2016

$$merge$$

Contributor

jujubot commented Oct 21, 2016

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

@jujubot jujubot merged commit 46edd89 into juju:develop Oct 21, 2016

@reedobrien reedobrien deleted the reedobrien:f/show-cloudregion-juju-models branch Oct 21, 2016

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