Merge lp:~allenap/maas/update-acceptance-for-trusty into lp:~maas-committers/maas/trunk

[Gavin Panella]

Update acceptance/Makefile to work with newer versions of the LXC tools.

The way LXC works has changed a bit in Trusty, so I needed to change acceptance/Makefile to work with it.

[Gavin Panella (allenap)]

I'm going to self-approve this. I don't think anyone else cares :)

review: Approve

=== modified file 'acceptance/Makefile'
--- acceptance/Makefile	2013-09-03 15:47:06 +0000
+++ acceptance/Makefile	2014-02-16 09:53:49 +0000
@@ -33,14 +33,13 @@
 
 # The container on which to base ephemerals.
 container := maas-$(series)
-containerdir := /var/lib/lxc/$(container)
 
 ## Convenience definitions.
 
 define ephexec
 sudo LC_ALL=C SSH_ASKPASS=$(abspath ubuntupass) setsid \
     lxc-start-ephemeral -b $(upstream) -o $(container) -u ubuntu -- \
-    DEBIAN_FRONTEND=noninteractive SUDO_ASKPASS=$(abspath ubuntupass)
+    env DEBIAN_FRONTEND=noninteractive SUDO_ASKPASS=$(abspath ubuntupass)
 endef
 
 define ephexec-make
@@ -65,9 +64,14 @@
 	@ls -1 *.deb
 	@touch $@
 
-container: $(containerdir)
+container: | services sudo
+ifneq ($(shell sudo lxc-ls -1 $(container)),$(container))
+	sudo lxc-create -n $(container) \
+	    -f /etc/lxc/default.conf -t ubuntu -- --release $(series)
+	$(abspath update-container) $(container)
+endif
 
-container-update: $(containerdir) | services sudo
+container-update: container | services sudo
 	$(abspath update-container) $(container)
 
 services:
@@ -124,11 +128,6 @@
 source/debian: | source
 	bzr export $@ $(packaging)/debian
 
-$(containerdir): | services sudo
-	sudo lxc-create -n $(container) \
-	    -f /etc/lxc/default.conf -t ubuntu -- --release $(series)
-	$(abspath update-container) $(container)
-
 ## Miscellaneous.
 
 sudo: