juju-ci-tools

Merge lp://staging/~abentley/juju-ci-tools/strip-host into lp://staging/juju-ci-tools

  1. strip-host
  2. Merge into trunk
Proposed by Aaron Bentley
Status: Merged
Merged at revision: 1787
Proposed branch: lp://staging/~abentley/juju-ci-tools/strip-host
Merge into: lp://staging/juju-ci-tools
Diff against target: 23 lines (+2/-0)
2 files modified
jujupy.py (+1/-0)
tests/test_jujupy.py (+1/-0)
To merge this branch: bzr merge lp://staging/~abentley/juju-ci-tools/strip-host
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+312273@code.staging.launchpad.net

Commit message

Omit host from 2.0 configs.

Description of the change

Strip "host" when making a bootstrap config for 2.x

In 1.x, the "host" value is used only with vsphere. In 2.x, it is reflected in "endpoint" in (public-)clouds.yaml. When it appears in 2.0, we get:
16:03:46 WARN juju.environs.config config.go:1036 unknown config field "host"

http://juju-ci.vapour.ws/job/functional-assess-cloud-vsphere/5/console

This branch strips it from the config that is emitted for bootstrap, while retaining it in JujuData._config, where it is sometimes used to identify the cloud.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches