lp:~thumper/juju-core/move-environs-tools
- Get this branch:
- bzr branch lp:~thumper/juju-core/move-environs-tools
Branch merges
- Juju Engineering: Pending requested
-
Diff: 2314 lines (+348/-363)59 files modifiedcmd/juju/bootstrap_test.go (+1/-1)
cmd/juju/status.go (+2/-1)
cmd/juju/status_test.go (+3/-2)
cmd/juju/synctools.go (+3/-4)
cmd/juju/synctools_test.go (+1/-1)
cmd/juju/upgradejuju.go (+1/-1)
cmd/juju/upgradejuju_test.go (+2/-3)
cmd/jujud/agent.go (+2/-1)
cmd/jujud/agent_test.go (+16/-16)
cmd/jujud/machine_test.go (+2/-1)
cmd/jujud/unit_test.go (+2/-1)
cmd/jujud/upgrade.go (+14/-14)
cmd/jujud/upgrade_test.go (+13/-14)
container/lxc/lxc.go (+7/-5)
container/lxc/lxc_test.go (+2/-2)
environs/agent/agent.go (+3/-2)
environs/cloudinit/cloudinit.go (+4/-3)
environs/cloudinit/cloudinit_test.go (+4/-3)
environs/ec2/ec2.go (+2/-2)
environs/jujutest/livetests.go (+5/-5)
environs/maas/environ.go (+2/-2)
environs/maas/environ_test.go (+1/-1)
environs/maas/util_test.go (+2/-1)
environs/openstack/export_test.go (+1/-1)
environs/openstack/provider.go (+2/-2)
environs/testing/storage.go (+1/-1)
environs/testing/tools.go (+5/-6)
environs/tools.go (+2/-3)
environs/tools_test.go (+1/-1)
state/api/params/internal.go (+1/-1)
state/api/upgrader/upgrader_test.go (+2/-1)
state/apiserver/upgrader/upgrader.go (+13/-12)
state/apiserver/upgrader/upgrader_test.go (+2/-1)
state/machine.go (+5/-4)
state/machine_test.go (+3/-2)
state/state.go (+0/-33)
state/state_test.go (+2/-1)
state/tools_test.go (+6/-39)
state/unit.go (+4/-3)
tools/agent.go (+8/-8)
tools/agent_test.go (+35/-34)
tools/build.go (+2/-1)
tools/diskmanager.go (+3/-9)
tools/diskmanager_test.go (+0/-30)
tools/list.go (+7/-7)
tools/list_test.go (+6/-9)
tools/marshal.go (+36/-0)
tools/marshal_test.go (+57/-0)
tools/storage.go (+6/-6)
tools/storage_test.go (+11/-10)
tools/tools_test.go (+0/-24)
worker/deployer/simple.go (+5/-4)
worker/deployer/simple_test.go (+4/-3)
worker/provisioner/lxc-broker.go (+3/-2)
worker/provisioner/lxc-broker_test.go (+3/-3)
worker/provisioner/provisioner.go (+3/-3)
worker/uniter/tools_test.go (+3/-3)
worker/uniter/uniter.go (+10/-8)
worker/uniter/uniter_test.go (+2/-2)
Branch information
Recent revisions
- 1408. By Tim Penhey
-
[r=thumper] Move state initialization out of jujud bootstrap
Methods to configure the initial state connection and dealing
with passwords were inside the jujud bootstrap command, which
isn't going to be used by the local provider, so the functions
need to be extracted. - 1407. By Tim Penhey
-
[r=thumper] Implement Storage and PublicStorage for local.
In the restructuring of the directories, I realized that we
should just have a configurable root directory for the
environment, and have other directories off that.The local config now just has a root-dir.
The namespace takes into consideration the root user, and
will look for the SUDO_USER environment variable if set
to identify the user calling sudo.I also renamed the storage to "storage" and "sharedStorage"
based on email conversations.The directories are no longer created when the config is
validated as the config may be being parsed and created
when the user isn't root, especially when the default directory
is in a restricted area.There are now two tests in the config_local.go file that are
only run when run as root. To run these locally I had to make
sure that the GOPATH was set:
sudo GOPATH=/home/tim/go go test -gocheck.f configRootTest - 1406. By Tim Penhey
-
[r=thumper] Further break up cloudinit.
Move the definitions of the mongo and machine agent
services into the upstart package. These have been
parameterized to allow reuse in the local provider. - 1405. By Dimiter Naydenov
-
[r=dimitern] deployer: omitted suggestions from a prev review
As promised in https:/
/codereview. appspot. com/10746044/
I'm adding the omitted suggestions from fwereade's
review. - 1404. By Alberto Donato
-
[r=dimitern],[bug=1195344] Add the environment UUID to the EnvironmentInfo API call response.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~go-bot/juju-core/trunk