Merge lp:~thumper/juju-core/selectively-install-lxc into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Conditionally install lxc

There are two primary situations where we don't want
the machine agent to install lxc:
 1. when the machine agent is inside an lxc container
    as known by state
 2. when the machine has been provisioned by the local
    provider (because it is an lxc container)

When lxc is installed inside a container, it adds a
bridge network device with the same defaults as the
host. This kills any routing in or out of the container.

Upstart provides support for setting environment variables
as part of the config, and we use this to pass the provider
type through.

https://codereview.appspot.com/11330043/

Conditionally install lxc

There are two primary situations where we don't want
the machine agent to install lxc:
 1. when the machine agent is inside an lxc container
    as known by state
 2. when the machine has been provisioned by the local
    provider (because it is an lxc container)

When lxc is installed inside a container, it adds a
bridge network device with the same defaults as the
host. This kills any routing in or out of othe container.

Upstart provides support for setting environment variables
as part of the config, and we use this to pass the provider
type through.

https://codereview.appspot.com/11330043/

[Tim Penhey (thumper)]

Reviewers: mp+174928_code.launchpad.net,

Message:
Please take a look.

Description:
Conditionally install lxc

There are two primary situations where we don't want
the machine agent to install lxc:
  1. when the machine agent is inside an lxc container
     as known by state
  2. when the machine has been provisioned by the local
     provider (because it is an lxc container)

When lxc is installed inside a container, it adds a
bridge network device with the same defaults as the
host. This kills any routing in or out of othe container.

Upstart provides support for setting environment variables
as part of the config, and we use this to pass the provider
type through.

https://code.launchpad.net/~thumper/juju-core/selectively-install-lxc/+merge/174928

Requires:
https://code.launchpad.net/~thumper/juju-core/lxc-identity/+merge/174922

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M cmd/jujud/machine.go
   M cmd/jujud/upgradevalidation.go
   M environs/azure/customdata_test.go
   M environs/cloudinit.go
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.go
   M environs/cloudinit_test.go
   M environs/local/environ.go
   M environs/local/environprovider.go
   M environs/maas/util_test.go
   M upstart/service.go
   M worker/deployer/simple.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: environs/cloudinit.go
=== modified file 'environs/cloudinit.go'
--- environs/cloudinit.go 2013-07-16 03:28:34 +0000
+++ environs/cloudinit.go 2013-07-16 06:18:45 +0000
@@ -38,6 +38,7 @@
    return fmt.Errorf("environment configuration has no authorized-keys")
   }
   mcfg.AuthorizedKeys = authKeys
+ mcfg.ProviderType = cfg.Type()
   if !mcfg.StateServer {
    return nil
   }

Index: cmd/jujud/machine.go
=== modified file 'cmd/jujud/machine.go'
--- cmd/jujud/machine.go 2013-07-11 16:09:00 +0000
+++ cmd/jujud/machine.go 2013-07-16 06:18:45 +0000
@@ -80,7 +80,7 @@
   if err := a.Conf.read(a.Tag()); err != nil {
    return err
   }
- if err := EnsureWeHaveLXC(a.Conf.DataDir); err != nil {
+ if err := EnsureWeHaveLXC(a.Conf.DataDir, a.Tag()); err != nil {
    log.Errorf("we were unable to install the lxc package, unable to
continue: %v", err)
    return err
   }

Index: cmd/jujud/upgradevalidation.go
=== modified file 'cmd/jujud/upgradevalidation.go'
--- cmd/jujud/upgradevalidation.go 2013-07-15 01:16:52 +0000
+++ cmd/jujud/upgradevalidation.go 2013-07-16 06:18:45 +0000
@@ -4,12 +4,15 @@
  package main

  import (
+ "os"
   "path/filepath"
   "time"

   "launchpad.net/loggo"

   "launchpad.net/juju-core/container/lxc"
+ "launchpad.net/juju-core/instance"
+ "launchpad.net/juju-core/state"
   "launchpad.net/juju-core/utils"
   "launchpad.net/juju-core/utils/fslock"
  )
@@ -44,7 +47,21 @@
  // dataDir is the root location where data files are put. It i...

[Martin Packman (gz)]

LGTM

https://codereview.appspot.com/11330043/diff/1/cmd/jujud/upgradevalidation.go
File cmd/jujud/upgradevalidation.go (right):

https://codereview.appspot.com/11330043/diff/1/cmd/jujud/upgradevalidation.go#newcode62
cmd/jujud/upgradevalidation.go:62: if providerType == "local" ||
containerType == instance.LXC {
It's a little surprising that these are two different condiditions.
Should the local provider 'machines' not be aware that they're lxc
containers anyway?

https://codereview.appspot.com/11330043/diff/1/environs/cloudinit/cloudinit_test.go
File environs/cloudinit/cloudinit_test.go (right):

https://codereview.appspot.com/11330043/diff/1/environs/cloudinit/cloudinit_test.go#newcode108
environs/cloudinit/cloudinit_test.go:108: cat >>
/etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0
agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit
0\\nenv JUJU_PROVIDER_TYPE="dummy"\\n\\nlimit nofile 20000
20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --log-file
'/var/log/juju/machine-0\.log' --data-dir '/var/lib/juju' --machine-id 0
  --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
These test assertions are so bad...

https://codereview.appspot.com/11330043/diff/1/environs/local/environ.go
File environs/local/environ.go (right):

https://codereview.appspot.com/11330043/diff/1/environs/local/environ.go#newcode382
environs/local/environ.go:382: agent.Env["HOME"] = os.Getenv("HOME")
Not strictly releated to this proposal?

https://codereview.appspot.com/11330043/

[Frank Mueller (themue)]

LGTM together with Martins comments.

https://codereview.appspot.com/11330043/diff/1/cmd/jujud/upgradevalidation.go
File cmd/jujud/upgradevalidation.go (right):

https://codereview.appspot.com/11330043/diff/1/cmd/jujud/upgradevalidation.go#newcode62
cmd/jujud/upgradevalidation.go:62: if providerType == "local" ||
containerType == instance.LXC {
Please change "local" to a constant usable in the whole system.

https://codereview.appspot.com/11330043/diff/1/environs/cloudinit/cloudinit_test.go
File environs/cloudinit/cloudinit_test.go (right):

https://codereview.appspot.com/11330043/diff/1/environs/cloudinit/cloudinit_test.go#newcode108
environs/cloudinit/cloudinit_test.go:108: cat >>
/etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0
agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit
0\\nenv JUJU_PROVIDER_TYPE="dummy"\\n\\nlimit nofile 20000
20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --log-file
'/var/log/juju/machine-0\.log' --data-dir '/var/lib/juju' --machine-id 0
  --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
On 2013/07/16 08:45:23, gz wrote:
> These test assertions are so bad...

+1

As it grows we should take time to find a more elegant way checking the
script content, e.g. different contains() with regex or so.

https://codereview.appspot.com/11330043/diff/1/environs/local/environprovider.go
File environs/local/environprovider.go (right):

https://codereview.appspot.com/11330043/diff/1/environs/local/environprovider.go#newcode18
environs/local/environprovider.go:18: const ProviderType = "local"
Ah, my wanted constant. ;)

https://codereview.appspot.com/11330043/

[Tim Penhey (thumper)]

https://codereview.appspot.com/11330043/diff/1/cmd/jujud/upgradevalidation.go
File cmd/jujud/upgradevalidation.go (right):

https://codereview.appspot.com/11330043/diff/1/cmd/jujud/upgradevalidation.go#newcode62
cmd/jujud/upgradevalidation.go:62: if providerType == "local" ||
containerType == instance.LXC {
On 2013/07/16 08:45:23, gz wrote:
> It's a little surprising that these are two different condiditions.
Should the
> local provider 'machines' not be aware that they're lxc containers
anyway?

Ideally yes, and hopefully relatively soon.

When we get multi-provider environments, the machines should know which
provider had created them. The more interesting bit here is that we
don't have access to the machine doc here, so can't check anyway.

https://codereview.appspot.com/11330043/diff/1/cmd/jujud/upgradevalidation.go#newcode62
cmd/jujud/upgradevalidation.go:62: if providerType == "local" ||
containerType == instance.LXC {
On 2013/07/16 10:52:37, mue wrote:
> Please change "local" to a constant usable in the whole system.

This adds a bucket load of dependencies that it shouldn't have.

I propose that RSN, we change the way we do some constants.

I'll think about the best solution, but may well be independent packages
that have no other dependencies.

https://codereview.appspot.com/11330043/diff/1/environs/cloudinit/cloudinit_test.go
File environs/cloudinit/cloudinit_test.go (right):

https://codereview.appspot.com/11330043/diff/1/environs/cloudinit/cloudinit_test.go#newcode108
environs/cloudinit/cloudinit_test.go:108: cat >>
/etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0
agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on
runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit
0\\nenv JUJU_PROVIDER_TYPE="dummy"\\n\\nlimit nofile 20000
20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --log-file
'/var/log/juju/machine-0\.log' --data-dir '/var/lib/juju' --machine-id 0
  --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
On 2013/07/16 10:52:37, mue wrote:
> On 2013/07/16 08:45:23, gz wrote:
> > These test assertions are so bad...

> +1

> As it grows we should take time to find a more elegant way checking
the script
> content, e.g. different contains() with regex or so.

I agree, it is just getting crazy.

Certainly worth spending some time on later.

https://codereview.appspot.com/11330043/diff/1/environs/local/environ.go
File environs/local/environ.go (right):

https://codereview.appspot.com/11330043/diff/1/environs/local/environ.go#newcode382
environs/local/environ.go:382: agent.Env["HOME"] = os.Getenv("HOME")
On 2013/07/16 08:45:23, gz wrote:
> Not strictly releated to this proposal?

Not entirely, no.

https://codereview.appspot.com/11330043/

[Go Bot (go-bot)]

The prerequisite https://code.launchpad.net/~thumper/juju-core/lxc-identity has not yet been merged into https://code.launchpad.net/~go-bot/juju-core/trunk.

=== modified file 'cmd/juju/bootstrap.go'
--- cmd/juju/bootstrap.go	2013-07-17 02:36:28 +0000
+++ cmd/juju/bootstrap.go	2013-07-17 02:36:28 +0000
@@ -11,6 +11,7 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/environs/provider"
 	"launchpad.net/juju-core/utils/set"
 	"launchpad.net/juju-core/version"
 	"os"
@@ -69,7 +70,7 @@
 		return err
 	}
 	// If we are using a local provider, always upload tools.
-	if environ.Config().Type() == "local" {
+	if environ.Config().Type() == provider.Local {
 		c.UploadTools = true
 	}
 	if c.UploadTools {

=== modified file 'cmd/jujud/machine.go'
--- cmd/jujud/machine.go	2013-07-11 16:09:00 +0000
+++ cmd/jujud/machine.go	2013-07-17 02:36:28 +0000
@@ -80,7 +80,7 @@
 	if err := a.Conf.read(a.Tag()); err != nil {
 		return err
 	}
-	if err := EnsureWeHaveLXC(a.Conf.DataDir); err != nil {
+	if err := EnsureWeHaveLXC(a.Conf.DataDir, a.Tag()); err != nil {
 		log.Errorf("we were unable to install the lxc package, unable to continue: %v", err)
 		return err
 	}

=== modified file 'cmd/jujud/upgradevalidation.go'
--- cmd/jujud/upgradevalidation.go	2013-07-17 02:36:28 +0000
+++ cmd/jujud/upgradevalidation.go	2013-07-17 02:36:28 +0000
@@ -4,12 +4,16 @@
 package main
 
 import (
+	"os"
 	"path/filepath"
 	"time"
 
 	"launchpad.net/loggo"
 
 	"launchpad.net/juju-core/container/lxc"
+	"launchpad.net/juju-core/environs/provider"
+	"launchpad.net/juju-core/instance"
+	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/utils/fslock"
 )
@@ -44,7 +48,21 @@
 // dataDir is the root location where data files are put. It is used to grab
 // the uniter-hook-execution lock so that we don't try run to apt-get at the
 // same time that a hook might want to run it.
-func EnsureWeHaveLXC(dataDir string) error {
+func EnsureWeHaveLXC(dataDir, machineTag string) error {
+	// We need to short circuit this in two places:
+	//   1. if we are running a local provider, then the machines are lxc
+	//     containers, and if we install lxc on them, it adds an lxc bridge
+	//     network device with the same ip address as the hosts bridge.  This
+	//     screws up all the networking routes.
+	//   2. if the machine is an lxc container, we need to avoid installing lxc
+	//     package for exactly the same reasons.
+	// Later, post-precise LTS, when we have updated lxc, we can bring this
+	// back in to have nested lxc, but until then, we have to avoid it.
+	containerType := state.ContainerTypeFromId(state.MachineIdFromTag(machineTag))
+	providerType := os.Getenv("JUJU_PROVIDER_TYPE")
+	if providerType == provider.Local || containerType == instance.LXC {
+		return nil
+	}
 	manager := lxc.NewContainerManager(lxc.ManagerConfig{Name: "lxc-test"})
 	if _, err := manager.ListContainers(); err == nil {
 		validationLogger.Debugf("found lxc, not installing")

=== modified file 'environs/azure/customdata_test.go'
--- environs/azure/customdata_test.go	2013-07-11 11:35:42 +0000
+++ environs/azure/customdata_test.go	2013-07-17 02:36:28 +0000
@@ -38,6 +38,7 @@
 			Addrs:  []string{"127.0.0.1:123"},
 			Tag:    state.MachineTag(machineID),
 		},
+		ProviderType: "azure",
 	}
 }
 

=== modified file 'environs/cloudinit.go'
--- environs/cloudinit.go	2013-07-17 00:44:30 +0000
+++ environs/cloudinit.go	2013-07-17 02:36:28 +0000
@@ -55,6 +55,7 @@
 		return fmt.Errorf("environment configuration has no authorized-keys")
 	}
 	mcfg.AuthorizedKeys = authKeys
+	mcfg.ProviderType = cfg.Type()
 	if !mcfg.StateServer {
 		return nil
 	}

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2013-07-11 22:23:18 +0000
+++ environs/cloudinit/cloudinit.go	2013-07-17 02:36:28 +0000
@@ -84,6 +84,9 @@
 	// commands cannot work.
 	AuthorizedKeys string
 
+	// ProviderType refers to the type of the provider that created the machine.
+	ProviderType string
+
 	// Config holds the initial environment configuration.
 	Config *config.Config
 
@@ -277,7 +280,7 @@
 	addScripts(c, fmt.Sprintf("ln -s %v %s", cfg.Tools.Binary, shquote(toolsDir)))
 
 	name := "jujud-" + tag
-	conf := upstart.MachineAgentUpstartService(name, toolsDir, cfg.DataDir, "/var/log/juju/", tag, machineId, logConfig)
+	conf := upstart.MachineAgentUpstartService(name, toolsDir, cfg.DataDir, "/var/log/juju/", tag, machineId, logConfig, cfg.ProviderType)
 	cmds, err := conf.InstallCommands()
 	if err != nil {
 		return fmt.Errorf("cannot make cloud-init upstart script for the %s agent: %v", tag, err)
@@ -383,6 +386,9 @@
 	if len(cfg.APIInfo.CACert) == 0 {
 		return fmt.Errorf("missing API CA certificate")
 	}
+	if cfg.ProviderType == "" {
+		return fmt.Errorf("missing provider type")
+	}
 	if cfg.StateServer {
 		if cfg.Config == nil {
 			return fmt.Errorf("missing environment configuration")

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2013-07-12 09:58:12 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-07-17 02:36:28 +0000
@@ -57,6 +57,7 @@
 		cfg: cloudinit.MachineConfig{
 			MachineId:      "0",
 			AuthorizedKeys: "sshkey1",
+			ProviderType:   "dummy",
 			// precise currently needs mongo from PPA
 			Tools:           newSimpleTools("1.2.3-precise-amd64"),
 			StateServer:     true,
@@ -104,7 +105,7 @@
 /var/lib/juju/tools/1\.2\.3-precise-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --constraints 'mem=2048M' --debug
 rm -rf '/var/lib/juju/agents/bootstrap'
 ln -s 1\.2\.3-precise-amd64 '/var/lib/juju/tools/machine-0'
-cat >> /etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --log-file '/var/log/juju/machine-0\.log' --data-dir '/var/lib/juju' --machine-id 0  --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
+cat >> /etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\nenv JUJU_PROVIDER_TYPE="dummy"\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --log-file '/var/log/juju/machine-0\.log' --data-dir '/var/lib/juju' --machine-id 0  --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
 start jujud-machine-0
 `,
 	}, {
@@ -112,6 +113,7 @@
 		cfg: cloudinit.MachineConfig{
 			MachineId:      "0",
 			AuthorizedKeys: "sshkey1",
+			ProviderType:   "dummy",
 			// raring provides mongo in the archive
 			Tools:           newSimpleTools("1.2.3-raring-amd64"),
 			StateServer:     true,
@@ -159,13 +161,14 @@
 /var/lib/juju/tools/1\.2\.3-raring-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --constraints 'mem=2048M' --debug
 rm -rf '/var/lib/juju/agents/bootstrap'
 ln -s 1\.2\.3-raring-amd64 '/var/lib/juju/tools/machine-0'
-cat >> /etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --log-file '/var/log/juju/machine-0\.log' --data-dir '/var/lib/juju' --machine-id 0  --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
+cat >> /etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\nenv JUJU_PROVIDER_TYPE="dummy"\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --log-file '/var/log/juju/machine-0\.log' --data-dir '/var/lib/juju' --machine-id 0  --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
 start jujud-machine-0
 `,
 	}, {
 		cfg: cloudinit.MachineConfig{
 			MachineId:      "99",
 			AuthorizedKeys: "sshkey1",
+			ProviderType:   "dummy",
 			DataDir:        environs.DataDir,
 			StateServer:    false,
 			Tools:          newSimpleTools("1.2.3-linux-amd64"),
@@ -197,7 +200,7 @@
 echo 'datadir: /var/lib/juju\\noldpassword: arble\\nmachinenonce: FAKE_NONCE\\nstateinfo:\\n  addrs:\\n  - state-addr\.testing\.invalid:12345\\n  cacert:\\n[^']+  tag: machine-99\\n  password: ""\\noldapipassword: ""\\napiinfo:\\n  addrs:\\n  - state-addr\.testing\.invalid:54321\\n  cacert:\\n[^']+  tag: machine-99\\n  password: ""\\n' > '/var/lib/juju/agents/machine-99/agent\.conf'
 chmod 600 '/var/lib/juju/agents/machine-99/agent\.conf'
 ln -s 1\.2\.3-linux-amd64 '/var/lib/juju/tools/machine-99'
-cat >> /etc/init/jujud-machine-99\.conf << 'EOF'\\ndescription "juju machine-99 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-99/jujud machine --log-file '/var/log/juju/machine-99\.log' --data-dir '/var/lib/juju' --machine-id 99  --debug >> /var/log/juju/machine-99\.log 2>&1\\nEOF\\n
+cat >> /etc/init/jujud-machine-99\.conf << 'EOF'\\ndescription "juju machine-99 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\nenv JUJU_PROVIDER_TYPE="dummy"\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-99/jujud machine --log-file '/var/log/juju/machine-99\.log' --data-dir '/var/lib/juju' --machine-id 99  --debug >> /var/log/juju/machine-99\.log 2>&1\\nEOF\\n
 start jujud-machine-99
 `,
 	}, {
@@ -205,6 +208,7 @@
 			MachineId:            "2/lxc/1",
 			MachineContainerType: "lxc",
 			AuthorizedKeys:       "sshkey1",
+			ProviderType:         "dummy",
 			DataDir:              environs.DataDir,
 			StateServer:          false,
 			Tools:                newSimpleTools("1.2.3-linux-amd64"),
@@ -236,7 +240,7 @@
 echo 'datadir: /var/lib/juju\\noldpassword: arble\\nmachinenonce: FAKE_NONCE\\nstateinfo:\\n  addrs:\\n  - state-addr\.testing\.invalid:12345\\n  cacert:\\n[^']+  tag: machine-2-lxc-1\\n  password: ""\\noldapipassword: ""\\napiinfo:\\n  addrs:\\n  - state-addr\.testing\.invalid:54321\\n  cacert:\\n[^']+  tag: machine-2-lxc-1\\n  password: ""\\n' > '/var/lib/juju/agents/machine-2-lxc-1/agent\.conf'
 chmod 600 '/var/lib/juju/agents/machine-2-lxc-1/agent\.conf'
 ln -s 1\.2\.3-linux-amd64 '/var/lib/juju/tools/machine-2-lxc-1'
-cat >> /etc/init/jujud-machine-2-lxc-1\.conf << 'EOF'\\ndescription "juju machine-2-lxc-1 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-2-lxc-1/jujud machine --log-file '/var/log/juju/machine-2-lxc-1\.log' --data-dir '/var/lib/juju' --machine-id 2/lxc/1  --debug >> /var/log/juju/machine-2-lxc-1\.log 2>&1\\nEOF\\n
+cat >> /etc/init/jujud-machine-2-lxc-1\.conf << 'EOF'\\ndescription "juju machine-2-lxc-1 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\nenv JUJU_PROVIDER_TYPE="dummy"\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-2-lxc-1/jujud machine --log-file '/var/log/juju/machine-2-lxc-1\.log' --data-dir '/var/lib/juju' --machine-id 2/lxc/1  --debug >> /var/log/juju/machine-2-lxc-1\.log 2>&1\\nEOF\\n
 start jujud-machine-2-lxc-1
 `,
 	},
@@ -554,6 +558,7 @@
 		MachineId:       "99",
 		Tools:           newSimpleTools("9.9.9-linux-arble"),
 		AuthorizedKeys:  "sshkey1",
+		ProviderType:    "dummy",
 		StateInfo: &state.Info{
 			Addrs:  []string{"host:98765"},
 			CACert: []byte(testing.CACert),

=== modified file 'environs/cloudinit_test.go'
--- environs/cloudinit_test.go	2013-07-09 10:32:23 +0000
+++ environs/cloudinit_test.go	2013-07-17 02:36:28 +0000
@@ -40,6 +40,7 @@
 	c.Assert(err, IsNil)
 	c.Assert(mcfg, DeepEquals, &cloudinit.MachineConfig{
 		AuthorizedKeys: "we-are-the-keys",
+		ProviderType:   "dummy",
 		StateInfo:      &state.Info{Tag: "not touched"},
 		APIInfo:        &api.Info{Tag: "not touched"},
 	})

=== modified file 'environs/local/config_test.go'
--- environs/local/config_test.go	2013-07-16 21:56:22 +0000
+++ environs/local/config_test.go	2013-07-17 02:36:28 +0000
@@ -13,6 +13,7 @@
 
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/local"
+	"launchpad.net/juju-core/environs/provider"
 	"launchpad.net/juju-core/testing"
 )
 
@@ -38,7 +39,7 @@
 func minimalConfigValues() map[string]interface{} {
 	return map[string]interface{}{
 		"name": "test",
-		"type": "local",
+		"type": provider.Local,
 		// While the ca-cert bits aren't entirely minimal, they avoid the need
 		// to set up a fake home.
 		"ca-cert":        testing.CACert,

=== modified file 'environs/local/environ.go'
--- environs/local/environ.go	2013-07-17 02:36:28 +0000
+++ environs/local/environ.go	2013-07-17 02:36:28 +0000
@@ -378,7 +378,9 @@
 	logConfig := "--debug" // TODO(thumper): specify loggo config
 	agent := upstart.MachineAgentUpstartService(
 		env.machineAgentServiceName(),
-		toolsDir, dataDir, logDir, tag, machineId, logConfig)
+		toolsDir, dataDir, logDir, tag, machineId, logConfig, env.config.Type())
+	agent.Env["USER"] = env.config.user
+	agent.Env["HOME"] = os.Getenv("HOME")
 
 	agent.InitDir = upstartScriptLocation
 	logger.Infof("installing service %s to %s", env.machineAgentServiceName(), agent.InitDir)

=== modified file 'environs/local/environprovider.go'
--- environs/local/environprovider.go	2013-07-17 02:36:28 +0000
+++ environs/local/environprovider.go	2013-07-17 02:36:28 +0000
@@ -10,6 +10,7 @@
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
+	constants "launchpad.net/juju-core/environs/provider"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
@@ -24,7 +25,7 @@
 var provider environProvider
 
 func init() {
-	environs.RegisterProvider("local", &environProvider{})
+	environs.RegisterProvider(constants.Local, &environProvider{})
 }
 
 // Open implements environs.EnvironProvider.Open.

=== modified file 'environs/local/instance.go'
--- environs/local/instance.go	2013-07-17 02:36:28 +0000
+++ environs/local/instance.go	2013-07-17 02:36:28 +0000
@@ -39,31 +39,19 @@
 
 // WaitDNSName implements instance.Instance.WaitDNSName.
 func (inst *localInstance) WaitDNSName() (string, error) {
-<<<<<<< TREE
 	return environs.WaitDNSName(inst)
-=======
-	return inst.DNSName()
->>>>>>> MERGE-SOURCE
 }
 
 // OpenPorts implements instance.Instance.OpenPorts.
 func (inst *localInstance) OpenPorts(machineId string, ports []instance.Port) error {
-<<<<<<< TREE
 	logger.Infof("OpenPorts called for %s:%v", machineId, ports)
 	return nil
-=======
-	return fmt.Errorf("instance open ports not implemented")
->>>>>>> MERGE-SOURCE
 }
 
 // ClosePorts implements instance.Instance.ClosePorts.
 func (inst *localInstance) ClosePorts(machineId string, ports []instance.Port) error {
-<<<<<<< TREE
 	logger.Infof("ClosePorts called for %s:%v", machineId, ports)
 	return nil
-=======
-	return fmt.Errorf("instance close not implemented")
->>>>>>> MERGE-SOURCE
 }
 
 // Ports implements instance.Instance.Ports.

=== modified file 'environs/local/local_test.go'
--- environs/local/local_test.go	2013-07-03 00:15:19 +0000
+++ environs/local/local_test.go	2013-07-17 02:36:28 +0000
@@ -10,6 +10,7 @@
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/local"
+	"launchpad.net/juju-core/environs/provider"
 	"launchpad.net/juju-core/testing"
 )
 
@@ -24,7 +25,7 @@
 var _ = Suite(&localSuite{})
 
 func (*localSuite) TestProviderRegistered(c *C) {
-	provider, error := environs.Provider("local")
+	provider, error := environs.Provider(provider.Local)
 	c.Assert(error, IsNil)
 	c.Assert(provider, DeepEquals, &local.Provider)
 }

=== modified file 'environs/maas/util_test.go'
--- environs/maas/util_test.go	2013-07-12 10:10:40 +0000
+++ environs/maas/util_test.go	2013-07-17 02:36:28 +0000
@@ -70,11 +70,12 @@
 			Password: "pw2",
 			CACert:   []byte("CA CERT\n" + testing.CACert),
 		},
-		DataDir:     environs.DataDir,
-		Config:      envConfig,
-		StatePort:   envConfig.StatePort(),
-		APIPort:     envConfig.APIPort(),
-		StateServer: true,
+		DataDir:      environs.DataDir,
+		Config:       envConfig,
+		StatePort:    envConfig.StatePort(),
+		APIPort:      envConfig.APIPort(),
+		StateServer:  true,
+		ProviderType: "maas",
 	}
 	script1 := "script1"
 	script2 := "script2"

=== added directory 'environs/provider'
=== added file 'environs/provider/provider.go'
--- environs/provider/provider.go	1970-01-01 00:00:00 +0000
+++ environs/provider/provider.go	2013-07-17 02:36:28 +0000
@@ -0,0 +1,13 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package provider
+
+const (
+	Local     = "local"
+	Dummy     = "dummy"
+	EC2       = "ec2"
+	MAAS      = "maas"
+	Azure     = "azure"
+	OpenStack = "openstack"
+)

=== modified file 'upstart/service.go'
--- upstart/service.go	2013-07-08 22:34:11 +0000
+++ upstart/service.go	2013-07-17 02:36:28 +0000
@@ -42,7 +42,7 @@
 
 // MachineAgentUpstartService returns the upstart config for a machine agent
 // based on the tag and machineId passed in.
-func MachineAgentUpstartService(name, toolsDir, dataDir, logDir, tag, machineId, logConfig string) *Conf {
+func MachineAgentUpstartService(name, toolsDir, dataDir, logDir, tag, machineId, logConfig, providerType string) *Conf {
 	svc := NewService(name)
 	logFile := filepath.Join(logDir, tag+".log")
 	return &Conf{
@@ -58,5 +58,8 @@
 			" --machine-id " + machineId +
 			" " + logConfig,
 		Out: logFile,
+		Env: map[string]string{
+			"JUJU_PROVIDER_TYPE": providerType,
+		},
 	}
 }

=== modified file 'worker/deployer/simple.go'
--- worker/deployer/simple.go	2013-07-09 11:31:00 +0000
+++ worker/deployer/simple.go	2013-07-17 02:36:28 +0000
@@ -142,6 +142,10 @@
 		Desc:    "juju unit agent for " + unitName,
 		Cmd:     cmd,
 		Out:     logPath,
+		// Propagate the provider type enviroment variable.
+		Env: map[string]string{
+			"JUJU_PROVIDER_TYPE": os.Getenv("JUJU_PROVIDER_TYPE"),
+		},
 	}
 	return uconf.Install()
 }