Update Ubuntu 14.04 image for GPB

- Update puppet to puppet4 on Ubuntu and CentOS7.
- Update garethr-docker version to 5.3.0.
- Facter gets auto-purged when puppet4 is installed, therefore
  use the version of facter shipped with puppet4 package.
- Add python-ipaddr package required for GBP job.
- Install additional kernel packages required for docker aufs.

Change-Id: I0a6b2290a687b76b65f563ab265ac7106dddedeb
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 343f61756b715d600b9358d065e2a513ba34bdec..05f0fa7637fd3f5b08236c1b864a51476cb77c4d 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -147,7 +147,23 @@ EOF
     # separate group installs from package installs since a non-existing
     # group with dnf based systems (F21+) will fail the install if such
     # a group does not exist
-    yum install -y unzip xz puppet git git-review perl-XML-XPath
+    yum install -y unzip xz git git-review perl-XML-XPath
+
+    # facter is not installed by default on the base image and facter package
+    # gets removed when puppet4 is updated. To fix this use version of facter
+    # shipped with puppet4.
+    yum install -y facter
+
+    # ensure facter is available in $PATH avoid failures in retry loop
+    export PATH="/opt/puppetlabs/bin/:$PATH"
+
+    # Install puppet4
+    rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm
+    yum -y install -y puppet-agent
+
+    # Create symlink for facter and puppet
+    ln -sf /opt/puppetlabs/bin/facter /usr/bin/facter
+    ln -sf /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
 
     # All of our systems require Java (because of Jenkins)
     # Install all versions of the OpenJDK devel but force 1.7.0 to be the
@@ -262,13 +278,20 @@ EOF
     # add additional repositories
     sudo add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
 
+    # facter is not installed by default on the base image and facter package
+    # gets removed when puppet4 is updated. To fix this use version of facter
+    # shipped with puppet4.
+    ensure_ubuntu_install facter
+    # ensure facter is available in $PATH avoid failures in retry loop
+    export PATH="/opt/puppetlabs/bin/:$PATH"
+
     echo "---> Installing base packages"
     apt-get clean
     apt-get update -m
     apt-get upgrade -m
     apt-get dist-upgrade -m
 
-    ensure_ubuntu_install unzip xz-utils puppet git libxml-xpath-perl
+    ensure_ubuntu_install unzip xz-utils git libxml-xpath-perl
 
     # Install python3 and dependencies, needed for Coala linting
     ensure_ubuntu_install python3
@@ -277,7 +300,7 @@ EOF
     # Install python and dependencies
     ensure_ubuntu_install python-{dev,virtualenv,setuptools,pip}
 
-    FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
+    FACTER_OSVER=$(facter operatingsystemrelease)
     case "$FACTER_OSVER" in
         14.04)
             echo "---> Installing OpenJDK"
@@ -291,11 +314,36 @@ EOF
             # make sure that we still default to openjdk 7
             update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
             update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac
+
+            echo "---> Install puppet repository for 14.04"
+            apt-get purge puppet puppet-common
+            wget https://apt.puppetlabs.com/puppetlabs-release-pc1-trusty.deb
+            dpkg -i puppetlabs-release-pc1-trusty.deb
+
+            echo "---> Installing puppet"
+            apt-get update -m
+            ensure_ubuntu_install puppet-agent
+            # Create symlink for facter and puppet
+            ln -sf /opt/puppetlabs/bin/facter /usr/bin/facter
+            ln -sf /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
         ;;
         16.04)
             echo "---> Installing OpenJDK"
             apt-get install openjdk-8-jdk
 
+            echo "---> Install puppet4 repository for 16.04"
+            apt-get purge puppet puppet-common
+            wget https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb
+            dpkg -i puppetlabs-release-pc1-xenial.deb
+
+            echo "---> Installing puppet"
+            apt-get update -m
+            ensure_ubuntu_install puppet-agent
+
+            # Create symlink for facter and puppet
+            ln -sf /opt/puppetlabs/bin/facter /usr/bin/facter
+            ln -sf /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
+
             echo "---> Installing python3 virtualenv"
             # python3-virtualenv is available starting with 16.04.
             ensure_ubuntu_install python3-virtualenv

diff --git a/packer/provision/gbp.sh b/packer/provision/gbp.sh
index 057c648e358944c69aa524d0528e5ebdc9b5c890..706e1525b5616aefc5721fbae1a48bf78459a88f 100644 (file)
--- a/packer/provision/gbp.sh
+++ b/packer/provision/gbp.sh
@@ -9,9 +9,16 @@ set -xeu -o pipefail
 # commands.
 export DEBIAN_FRONTEND=noninteractive
 
+# 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
+
 # we need garethr-docker in our puppet manifest to install docker
 # cleanly
-puppet module install garethr-docker --version 4.1.1
+puppet module install garethr-docker --version 5.3.0
 
 # 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

diff --git a/packer/provision/gbp_puppet/gbp_packages.pp b/packer/provision/gbp_puppet/gbp_packages.pp
index cfd4c6d91b392c0d7643374634142d9d6be87ab5..6d97a33927e0189bddf1f470224e38a7c4f8ab2a 100644 (file)
--- a/packer/provision/gbp_puppet/gbp_packages.pp
+++ b/packer/provision/gbp_puppet/gbp_packages.pp
@@ -6,6 +6,7 @@ package { [
   'git-core',
   'git',
   'curl',
-  'bridge-utils']:
+  'bridge-utils',
+  'python-ipaddr']:
   ensure => present,
 }