Merge lp://staging/~lifeless/pyjuju/bug-945505 into lp://staging/pyjuju
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~lifeless/pyjuju/bug-945505 |
Merge into: | lp://staging/pyjuju |
Diff against target: |
70 lines (+7/-7) 3 files modified
juju/providers/ec2/machine.py (+1/-1) juju/providers/ec2/tests/test_getmachines.py (+4/-4) juju/providers/ec2/tests/test_machine.py (+2/-2) |
To merge this branch: | bzr merge lp://staging/~lifeless/pyjuju/bug-945505 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gustavo Niemeyer | Disapprove | ||
Martin Packman (community) | Abstain | ||
Review via email: mp+111754@code.staging.launchpad.net |
Description of the change
This changes the EC2 Machine provider to supply the public IP rather than the public DNS to the Machine instance. Machines don't have ip and dns, only one contact field, but that is stringifie pretty much everywhere, so putting ip addresses in it works fine.
I think we should probably rename the public and private names to endpoints, or something similar, to avoid confusion, but thats clearly orthogonal to this patch, which merely changes how its populated.
We don't, as far as I can tell, need to do this for internal names, as the inside-openstack dnsmasq instance handles them, its only the public ones, for the client machine, that need to avoid depending on DNS.
Unmerged revisions
- 545. By Robert Collins
-
Use the EC2 IP address rather than public DNS name. Openstack clouds do
not have out of the box sane DNS mapping implementations (vs EC2 which
just has the ip address statically mapped in DNS), so the public name
returned by openstack is 'server-N' rather than something sensible like
'10-0-0-3.openstack. domain' . Further complicating matters, folk running
private openstack deploys will often not have local DNS setup at all, and
using the IP address avoids all of that complexity.This requires txaws rev 134, which is in quantal and will be backported to
precise in an SRU shortly.
So, it's a little perverse putting ip_address in an attribute named dns_name but it's what I do with the openstack provider too.
Having this as a flag-day revision rather than continuing with the old behaviour for previous txaws releases I'm a bit wary of, given the lack of a txaws release that actually includes the required change.
Updating juju/machine/ __init_ _.py or at least the comment there would be good.