lp://staging/~natefinch/juju-core/039-saveapiaddresses
- Get this branch:
- bzr branch lp://staging/~natefinch/juju-core/039-saveapiaddresses
Branch merges
- Juju Engineering: Pending requested
-
Diff: 34 lines (+10/-0)1 file modifiedcmd/jujud/machine.go (+10/-0)
Branch information
Recent revisions
- 2520. By Andrew Wilkins
-
[r=axwalk] state/api: dial info.Addrs in parallel
This change is to dial all addresses in
parallel. The first one that successfully
connects is used. - 2519. By Andrew Wilkins
-
[r=axwalk] Initialise APIHostPorts during bootstrap
jujud bootstrap-state is updated to query
the provider for the instance's addresses
and store them in state. Additionally,
State.SetAPIHostPorts is called with those
addresses and the API server port defined
in agent.conf. - 2518. By Andrew Wilkins
-
[r=axwalk] agent: add ConfigSetterOnl
y.SetAPIHostPor ts We still only store addresses in the config,
so we lose some metadata. We make use of the
scope metadata before storing, though, to
prune the addresses to the internal ones. - 2517. By Andrew Wilkins
-
[r=axwalk] Cache API server addresses in .jenv
We now return API server addresses from
the Login API, and cache those addresses
in the client's configstore. If the client
connects using environments.yaml, then it
is expected to get updated addresses from
provider-state. - 2516. By Ian Booth
-
[r=wallyworld] Improve ssh.ReplaceKeys
ReplaceKeys is used by the authentication worker
to write ssh keys to ~/.ssh/authorized_ keys. It
merges existing keys with those added to Juju. It
checks that all keys to be written have comments, but
existing keys may not have comments. The check for key
comment is done as any keys are added to Juju so the
check in ReplaceKeys can be removed. - 2515. By Ian Booth
-
[r=wallyworld],[bug=1221798] Remove obsolete Public/
PrivateAddress methods The PublicAddress() and PrivateAddress() methods
on environs.EnvironProvider are no longer needed
since units now get their addresses from their
assigned machine, and these addresses are
updated by the instance poller.Extra logic was required to allow the existing
machineAddresses method to be able to handle
subordinate units.This work allows the Joyent provider to be
enabled. Smoke tested by hand on Joyent, local,
EC2, HP CLoud and Azure: bootstrap environment,
deploy a unit or two and check status. For
Joyent, do a little more testing and ensure
wordpress works. - 2514. By Dimiter Naydenov
-
[r=dimitern] cmd/juju: Add --(exclude-
)networks args to deploy Implemented two new arguments to juju deploy:
--networks and --exclude-networks. They allow specifying
networks to enable/disable when deploying new machines
hosting units of the service.If the API server is older than 1.17.7 and does not
support ServiceDeployWithNetworks, and networks are
specified, an error is returned. Otherwise (without
networks specified), the command falls back to using
ServiceDeploy API.https:/
/codereview. appspot. com/80600044/ R=jameinel
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/~go-bot/juju-core/trunk