Merge lp:~dave-cheney/pyjuju/go-state-add-environment into lp:pyjuju/go

[Dave Cheney]

state: add state.Environment

This func provides direct access to the current environment
configuration as a *ConfigNode. This is used buy jujut and
is needed for testing the provisioning agent as
state.readConfigNode() is not exported.

https://codereview.appspot.com/6261055/

[Gustavo Niemeyer (niemeyer)]

LGTM, but can you please add a trivial test before submitting?

https://codereview.appspot.com/6261055/

=== modified file 'state/state.go'
--- state/state.go	2012-05-29 23:11:41 +0000
+++ state/state.go	2012-05-31 07:26:18 +0000
@@ -74,6 +74,11 @@
 	return newConfigWatcher(s, zkEnvironmentPath)
 }
 
+// Environment returns the current configuration of the environment.
+func (s *State) Environment() (*ConfigNode, error) {
+	return readConfigNode(s.zk, zkEnvironmentPath)
+}
+
 // Machine returns the machine with the given id.
 func (s *State) Machine(id int) (*Machine, error) {
 	key := machineKey(id)