Merge lp://staging/~aramh/juju-core/108-firewaller-new-watcher-units6 into lp://staging/~juju/juju-core/trunk

Proposed by Aram Hăvărneanu
Status: Work in progress
Proposed branch: lp://staging/~aramh/juju-core/108-firewaller-new-watcher-units6
Merge into: lp://staging/~juju/juju-core/trunk
Prerequisite: lp://staging/~aramh/juju-core/107-state-watchers-units-unassignments6
Diff against target: 144 lines (+74/-39)
1 file modified
worker/firewaller/firewaller.go (+74/-39)
To merge this branch: bzr merge lp://staging/~aramh/juju-core/108-firewaller-new-watcher-units6
Reviewer Review Type Date Requested Status
The Go Language Gophers Pending
Review via email: mp+130119@code.staging.launchpad.net

Description of the change

firewaller: use new style machine units watcher

https://codereview.appspot.com/6714051/

To post a comment you must log in.
Revision history for this message
Aram Hăvărneanu (aramh) wrote :

Reviewers: mp+130119_code.launchpad.net,

Message:
Please take a look.

Description:
firewaller: use new style machine units watcher

https://code.launchpad.net/~aramh/juju-core/108-firewaller-new-watcher-units6/+merge/130119

Requires:
https://code.launchpad.net/~aramh/juju-core/107-state-watchers-units-unassignments6/+merge/130118

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6714051/

Affected files:
   A [revision details]
   M worker/firewaller/firewaller.go

Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :

Please propose again when the pre-req is sorted out.

https://codereview.appspot.com/6714051/

Unmerged revisions

679. By Aram Hăvărneanu

all: merge lp:~aramh/juju-core/107-state-watchers-units-unassignments6

678. By Aram Hăvărneanu

state: go fmt

677. By Aram Hăvărneanu

firewaller: change to new watcher model

676. By Aram Hăvărneanu

state: make machine units report unassigment

675. By Roger Peppe

environs, juju: require admin-secret

The admin-secret configuration value is required
for bootstrapping and connecting to an environment,
but we can't make config.Config require it because
it should never be pushed into the state.

So we add checks to juju.NewConn and implementations
of Environ.Bootstrap to require that it be set.
This unfortunately means that all tests must
connect with authentication set, which means
the changes are necessarily bulky.

R=TheMue, dfc, fwereade, niemeyer
CC=
https://codereview.appspot.com/6653050

674. By Dave Cheney

cmd/juju: add remove-unit subcommand

R=fwereade, niemeyer, rog
CC=
https://codereview.appspot.com/6651060

673. By Gustavo Niemeyer

state: fix firewall-mode tests

Firewall mode default is now spelled as "".

R=
CC=
https://codereview.appspot.com/6699044

672. By Roger Peppe

environs/ec2: tear down suite properly

LiveTests wasn't destroying the environment.

Also simplify ec2.Destroy a little, now that the AllInstances
method exists.

R=fwereade, dfc, niemeyer
CC=
https://codereview.appspot.com/6646051

671. By Frank Mueller

environs: added global open/close/ports

Added the definition of OpenPorts(), ClosePorts() and Ports()
to Environ and changed the implementations of dummy and ec2.
dummy only supports instance firewall mode, ec2 both. The
common test for the global mode is skipped if the environment
does not support that mode.

R=niemeyer
CC=
https://codereview.appspot.com/6652047

670. By Frank Mueller

environs: ec2 and dummy default to instance

The validation of the configuration for the providers
ec2 and dummy now exchanges "default" with "instance".
The implementations of the global mode has been rolled
back to avoid failing tests. A later change will
prohibit opening and closing of ports on instances
in the global mode.

R=niemeyer, fwereade, <email address hidden>
CC=
https://codereview.appspot.com/6653043

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