~therve/pyjuju/validate-config-values

« back to all changes in this revision

Viewing changes to juju/providers/local/__init__.py

  • Committer: kapil.thangavelu at canonical
  • Date: 2012-04-12 18:39:20 UTC
  • mfrom: (509.1.4 managed-zk-client)
  • Revision ID: kapil.thangavelu@canonical.com-20120412183920-jjrhrpibxzkexk1v
merge managed-zk-client, also fix trunk test, and disable topo migration [r=fwereade]

 juju now uses the txzookeeper.managed Client which automatically restablishes 
 sessions recreating presence nodes and triggering extant watches.

 This also fixes some subordinte changes, namely a broken lxc test, and disables the 
 transparent topology migration as without accompanying code changes to running agents
 it will cause problems.

Show diffs side-by-side

added added

removed removed

Lines of Context:
129
129
        hierarchy = StateHierarchy(
130
130
            client, admin_identity, "local", constraints.data, "local")
131
131
        yield hierarchy.initialize()
 
132
        yield client.close()
132
133
 
133
134
        # Startup the machine agent
134
135
        log_file = os.path.join(self._directory, "machine-agent.log")