X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Fgbp.sh;h=95ba70c9b076f21d4420f79e88124e2148fccd26;hb=b5a16be5c91f0971e492c20b389057ac29526789;hp=dc461c94ccdb12f73c46f3978897dd5d584ec986;hpb=4fe946ab377d9063e5cc214a1104c1d2a1525c1c;p=releng%2Fbuilder.git

diff --git a/packer/provision/gbp.sh b/packer/provision/gbp.sh
index dc461c94c..95ba70c9b 100644
--- a/packer/provision/gbp.sh
+++ b/packer/provision/gbp.sh
@@ -2,13 +2,23 @@
 
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
+# force any errors to cause the script and job to end in failure
+set -xeu -o pipefail
+
 # Ensure that necessary variables are set to enable noninteractive mode in
 # commands.
 export DEBIAN_FRONTEND=noninteractive
 
-# we need garethr-docker in our puppet manifest to install docker
-# cleanly
-puppet module install garethr-docker --version 4.1.1
+# additional kernel packages required for docker to fix
+# aufs failed: driver not supported
+echo "---> Installing Additional kernel packages required for docker"
+apt-get update
+apt-get install "linux-image-extra-$(uname -r)" linux-image-extra-virtual
+modprobe aufs
+
+# Install and configure docker. Use puppetlabs docker which supports
+# Ubuntu 16.04
+puppet module install puppetlabs-docker_platform --version 2.2.1
 
 # do the package install via puppet so that we know it actually installs
 # properly and it also makes it quieter but with better error reporting