Merge lp:~thumper/juju-core/lxc-cloud-init into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Add lxc to our cloud-init packages

However don't add lxc if the machine itself is an
lxc container as the install fails on precise causing
the lxc container to fail to start.

https://codereview.appspot.com/10235047/

Add lxc to our cloud-init packages

However don't add lxc if the machine itself is an
lxc container as the install fails on precise causing
the lxc container to fail to start.

https://codereview.appspot.com/10235047/

[Tim Penhey (thumper)]

Reviewers: mp+169328_code.launchpad.net,

Message:
Please take a look.

Description:
Add lxc to our cloud-init packages

However don't add lxc if the machine itself is an
lxc container as the install fails on precise causing
the lxc container to fail to start.

https://code.launchpad.net/~thumper/juju-core/lxc-cloud-init/+merge/169328

Requires:
https://code.launchpad.net/~thumper/juju-core/machine-id-from-tag/+merge/169327

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M environs/cloudinit/cloudinit.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/cloudinit.go
=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go 2013-06-04 21:43:25 +0000
+++ environs/cloudinit/cloudinit.go 2013-06-14 02:32:16 +0000
@@ -74,6 +74,10 @@
   // MachineId identifies the new machine.
   MachineId string

+ // MachineContainerType specifies the type of container that the machine
+ // is. If the machine is not a container, then the type is "".
+ MachineContainerType string
+
   // AuthorizedKeys specifies the keys that are allowed to
   // connect to the machine (see cloudinit.SSHAddAuthorizedKeys)
   // If no keys are supplied, there can be no ssh access to the node.
@@ -115,6 +119,11 @@
   }
   c.AddSSHAuthorizedKeys(cfg.AuthorizedKeys)
   c.AddPackage("git")
+ // Perfectly reasonable to install lxc on environment instances and kvm
+ // containers.
+ if cfg.MachineContainerType != "lxc" {
+ c.AddPackage("lxc")
+ }

   addScripts(c,
    "set -xe", // ensure we run all the scripts or abort.

[William Reade (fwereade)]

Needs a CheckPackage in a test somewhere

https://codereview.appspot.com/10235047/

[John A Meinel (jameinel)]

LGTM caveat William's request.

https://codereview.appspot.com/10235047/

[Tim Penhey (thumper)]

Please take a look.

https://codereview.appspot.com/10235047/

[Serge Hallyn (serge-hallyn)]

Hi,

Not installing lxc by default if you're already inside a container is
reasonable, since you may well not have been able to control the
environment of the first container.

However, if you are able to control the creation of the first container
(as you are in juju), then you can make lxc installable inside that
container. It amounts to:

1. set lxc.aa_profile = lxc-container-default-with-nesting
2. set lxc.mount.hook = /usr/share/lxc/hooks/mountcgroups
3. the lxc package should set up a lxcbr0 which does not conflict with
the parent container's address. The saucy package does this by default.
  If it is needed, we could try to SRU that change to precise's lxc.
Alternatively, you could hack the lxc network configuration settings by
hand (from cloud-init or from juju install script) by either modifying
/etc/default/lxc after the fact, or creating a suitable one ahead of
time so that lxc does not overwrite it on install.

cloud-init can detect that 1 and 2 are satisified ( by looking at
/proc/1/attr/current to check the aa profile and by checking whether
cgroups are mounted).

https://codereview.appspot.com/10235047/

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2013-06-04 21:43:25 +0000
+++ environs/cloudinit/cloudinit.go	2013-06-16 22:30:37 +0000
@@ -74,6 +74,10 @@
 	// MachineId identifies the new machine.
 	MachineId string
 
+	// MachineContainerType specifies the type of container that the machine
+	// is.  If the machine is not a container, then the type is "".
+	MachineContainerType string
+
 	// AuthorizedKeys specifies the keys that are allowed to
 	// connect to the machine (see cloudinit.SSHAddAuthorizedKeys)
 	// If no keys are supplied, there can be no ssh access to the node.
@@ -115,6 +119,11 @@
 	}
 	c.AddSSHAuthorizedKeys(cfg.AuthorizedKeys)
 	c.AddPackage("git")
+	// Perfectly reasonable to install lxc on environment instances and kvm
+	// containers.
+	if cfg.MachineContainerType != "lxc" {
+		c.AddPackage("lxc")
+	}
 
 	addScripts(c,
 		"set -xe", // ensure we run all the scripts or abort.

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2013-05-31 08:15:19 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-06-16 22:30:37 +0000
@@ -199,6 +199,45 @@
 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
 start jujud-machine-99
 `,
+	}, {
+		cfg: cloudinit.MachineConfig{
+			MachineId:            "2/lxc/1",
+			MachineContainerType: "lxc",
+			AuthorizedKeys:       "sshkey1",
+			DataDir:              "/var/lib/juju",
+			StateServer:          false,
+			Tools:                newSimpleTools("1.2.3-linux-amd64"),
+			MachineNonce:         "FAKE_NONCE",
+			StateInfo: &state.Info{
+				Addrs:    []string{"state-addr.example.com:12345"},
+				Tag:      "machine-2-lxc-1",
+				Password: "arble",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+			APIInfo: &api.Info{
+				Addrs:    []string{"state-addr.example.com:54321"},
+				Tag:      "machine-2-lxc-1",
+				Password: "bletch",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+		},
+		expectScripts: `
+set -xe
+mkdir -p /var/lib/juju
+mkdir -p /var/log/juju
+bin='/var/lib/juju/tools/1\.2\.3-linux-amd64'
+mkdir -p \$bin
+wget --no-verbose -O - 'http://foo\.com/tools/juju1\.2\.3-linux-amd64\.tgz' \| tar xz -C \$bin
+echo -n 'http://foo\.com/tools/juju1\.2\.3-linux-amd64\.tgz' > \$bin/downloaded-url\.txt
+cat > /etc/rsyslog.d/25-juju.conf << 'EOF'\\n\\n\$ModLoad imfile\\n\\n\$InputFilePollInterval 5\\n\$InputFileName /var/log/juju/machine-2-lxc-1.log\\n\$InputFileTag juju-machine-2-lxc-1:\\n\$InputFileStateFile machine-2-lxc-1\\n\$InputRunFileMonitor\\n\\n:syslogtag, startswith, \"juju-\" @state-addr.example.com:514\\n& ~\\nEOF\\n
+restart rsyslog
+mkdir -p '/var/lib/juju/agents/machine-2-lxc-1'
+echo 'datadir: /var/lib/juju\\noldpassword: arble\\nmachinenonce: FAKE_NONCE\\nstateinfo:\\n  addrs:\\n  - state-addr\.example\.com:12345\\n  cacert:\\n[^']+  tag: machine-2-lxc-1\\n  password: ""\\noldapipassword: ""\\napiinfo:\\n  addrs:\\n  - state-addr\.example\.com: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
+start jujud-machine-2-lxc-1
+`,
 	},
 }
 
@@ -260,6 +299,9 @@
 			checkEnvConfig(c, test.cfg.Config, x, scripts)
 		}
 		checkPackage(c, x, "git", true)
+		// The lxc package should only be there if the machine container type is not lxc.
+		hasLxc := test.cfg.MachineContainerType != "lxc"
+		checkPackage(c, x, "lxc", hasLxc)
 		if test.cfg.StateServer {
 			checkPackage(c, x, "mongodb-server", true)
 			source := struct{ source, key string }{