MT#17213 Add Puppet install from Git repo and support of hiera rescue drive

Add new deployment.sh boot options:
* puppetgitrepo - remote Puppet git repository
* puppetgitbranch - git branch with Puppet sources
* puppetrescuedrive - Linux drive wth Hiera dump
* puppetinithiera - init Hiera Puppet configs

Change-Id: Ic17cd4218e9a42aaca23dbeae4b92f4d5e26d6db

deployment.sh

@@ -45,6 +45,12 @@ CARRIER_EDITION=false
 NGCP_INSTALLER=false
 PUPPET=''
 PUPPET_SERVER=puppet.mgm.sipwise.com
+PUPPET_GIT_REPO=''
+PUPPET_GIT_BRANCH=master
+PUPPET_LOCAL_GIT="${TARGET}/tmp/puppet.git"
+PUPPET_INIT_HIERA=false
+PUPPET_RESCUE_DRIVE="/dev/null"
+PUPPET_RESCUE_PATH="/mnt/cdrom"
 RESTART_NETWORK=true
 INTERACTIVE=false
 DHCP=false
@@ -473,6 +479,22 @@ if checkBootParam "puppetserver" ; then
   PUPPET_SERVER=$(getBootParam puppetserver)
 fi
 
+if checkBootParam "puppetgitrepo" ; then
+  PUPPET_GIT_REPO=$(getBootParam puppetgitrepo)
+fi
+
+if checkBootParam "puppetgitbranch" ; then
+  PUPPET_GIT_BRANCH=$(getBootParam puppetgitbranch)
+fi
+
+if checkBootParam "puppetrescuedrive" ; then
+  PUPPET_RESCUE_DRIVE=$(getBootParam puppetrescuedrive)
+fi
+
+if checkBootParam "puppetinithiera" ; then
+  PUPPET_INIT_HIERA=true
+fi
+
 if checkBootParam "debianrelease" ; then
   DEBIAN_RELEASE=$(getBootParam debianrelease)
 fi
@@ -2132,6 +2154,103 @@ if "$VAGRANT" ; then
 fi
 
 if [ -n "$PUPPET" ] ; then
+
+check_puppet_rc () {
+  local _puppet_rc="$1"
+  local _expected_rc="$2"
+
+  if [ "${_puppet_rc}" != "${_expected_rc}" ] ; then
+    # an exit code of '0' happens for 'puppet agent --enable' only,
+    # an exit code of '2' means there were changes,
+    # an exit code of '4' means there were failures during the transaction,
+    # an exit code of '6' means there were both changes and failures.
+    set_deploy_status "error"
+  fi
+}
+
+puppet_install_from_git () {
+  : "${PUPPET_GIT_REPO?ERROR: variable 'PUPPET_GIT_REPO' is NOT defined, cannot continue.}"
+  : "${PUPPET_LOCAL_GIT?ERROR: variable 'PUPPET_LOCAL_GIT' is NOT defined, cannot continue.}"
+  : "${PUPPET_GIT_BRANCH?ERROR: variable 'PUPPET_GIT_BRANCH' is NOT defined, cannot continue.}"
+
+  echo "Cloning Puppet git repository from '${PUPPET_GIT_REPO}' to '${PUPPET_LOCAL_GIT}' (branch '${PUPPET_GIT_BRANCH}')"
+  if ! git clone --depth 1 -b "${PUPPET_GIT_BRANCH}" "${PUPPET_GIT_REPO}" "${PUPPET_LOCAL_GIT}" ; then
+    echo "ERROR: Cannot clone git repository, see the error above, cannot continue!" >&2
+    exit 1
+  fi
+
+  echo "Deploying Puppet config from Git repository to ${TARGET}/etc/puppet/"
+  cp -a "${PUPPET_LOCAL_GIT}/manifests" "${TARGET}/etc/puppet/"
+  cp -a "${PUPPET_LOCAL_GIT}/modules" "${TARGET}/etc/puppet/"
+  rm -rf "${PUPPET_LOCAL_GIT}"
+
+  case "${PUPPET_RESCUE_DRIVE}" in
+    /dev/cdrom)
+      echo "Copying Hiera rescue data from drive '${PUPPET_RESCUE_DRIVE}' (mounted into '${PUPPET_RESCUE_PATH}')"
+      mkdir -p "${PUPPET_RESCUE_PATH}"
+      mount -t iso9660 -o ro "${PUPPET_RESCUE_DRIVE}" "${PUPPET_RESCUE_PATH}"
+      mkdir -m 0700 -p "${TARGET}/etc/puppet/hieradata/"
+      cp -a "${PUPPET_RESCUE_PATH}"/hieradata/* "${TARGET}/etc/puppet/hieradata/"
+      umount -f "${PUPPET_RESCUE_PATH}"
+      rmdir "${PUPPET_RESCUE_PATH}"
+      ;;
+    /dev/null)
+      echo "Hiera rescue drive has been skipped as requested."
+      ;;
+    *)
+      echo "ERROR: Unsupported rescue drive '${PUPPET_RESCUE_DRIVE}', cannot continue!" >&2
+      exit 1
+      ;;
+  esac
+
+  case "${DEBIAN_RELEASE}" in
+    jessie|stretch)
+      echo "Supported Debian release ${DEBIAN_RELEASE} detected, continue..."
+      if "${PUPPET_INIT_HIERA}" ; then
+        echo "Initializing Hiera config..."
+        grml-chroot $TARGET puppet apply --test -e "include puppet::hiera" 2>&1 | tee -a /tmp/puppet.log
+        check_puppet_rc "${PIPESTATUS[0]}" "2"
+      fi
+      grml-chroot $TARGET puppet apply --test --tags core /etc/puppet/manifests/site.pp 2>&1 | tee -a /tmp/puppet.log
+      check_puppet_rc "${PIPESTATUS[0]}" "2"
+      if [ -f "${TARGET}/etc/profile.d/puppet-agent.sh" ] ; then
+          echo "Exporting Puppet 4 new PATH (otherwise /opt/puppetlabs/bin/puppet is not found)"
+          source "${TARGET}/etc/profile.d/puppet-agent.sh"
+      fi
+      grml-chroot $TARGET puppet apply --test /etc/puppet/manifests/site.pp 2>&1 | tee -a /tmp/puppet.log
+      check_puppet_rc "${PIPESTATUS[0]}" "2"
+      ;;
+    *)
+      echo "ERROR: Unsupported Debian release ${DEBIAN_RELEASE} detected, cannot continue!" >&2
+      exit 1
+      ;;
+  esac
+}
+
+puppet_install_from_puppet () {
+  case "${DEBIAN_RELEASE}" in
+    squeeze|wheezy)
+      echo "Supported Debian release ${DEBIAN_RELEASE} detected, continue..."
+      chroot $TARGET sed -i 's/START=.*/START=yes/' /etc/default/puppet
+      grml-chroot $TARGET puppet agent --test --waitforcert 30 2>&1 | tee -a /tmp/puppet.log
+      check_puppet_rc "${PIPESTATUS[0]}" "2"
+      ;;
+    jessie|stretch)
+      echo "Supported Debian release ${DEBIAN_RELEASE} detected, continue..."
+      grml-chroot $TARGET puppet agent --enable 2>&1 | tee -a /tmp/puppet.log
+      check_puppet_rc "${PIPESTATUS[0]}" "0"
+      grml-chroot $TARGET puppet agent --test --tags core --waitforcert 30 2>&1 | tee -a /tmp/puppet.log
+      check_puppet_rc "${PIPESTATUS[0]}" "2"
+      grml-chroot $TARGET puppet agent --test 2>&1 | tee -a /tmp/puppet.log
+      check_puppet_rc "${PIPESTATUS[0]}" "2"
+      ;;
+    *)
+      echo "ERROR: Unsupported Debian release ${DEBIAN_RELEASE} detected, cannot continue!" >&2
+      exit 1
+      ;;
+  esac
+}
+
   set_deploy_status "puppet"
   echo "Rebuilding /etc/hosts"
   cat > $TARGET/etc/hosts << EOF
@@ -2173,35 +2292,15 @@ ssl_client_verify_header=SSL_CLIENT_VERIFY
 environment=$PUPPET
 EOF
 
-check_puppet_rc () {
-  local _puppet_rc="$1"
-  local _expected_rc="$2"
-
-  if [ "${_puppet_rc}" != "${_expected_rc}" ] ; then
-    # an exit code of '0' happens for 'puppet agent --enable' only,
-    # an exit code of '2' means there were changes,
-    # an exit code of '4' means there were failures during the transaction,
-    # an exit code of '6' means there were both changes and failures.
-    set_deploy_status "error"
+  if [ -n "${PUPPET_GIT_REPO}" ] ; then
+    echo "Installing from Puppet Git repository using 'puppet apply'"
+    puppet_install_from_git
+  else
+    echo "Installing from Puppet server '${PUPPET_SERVER}' using 'puppet agent'"
+    puppet_install_from_puppet
   fi
-}
 
-  case "$DEBIAN_RELEASE" in
-    squeeze|wheezy)
-      chroot $TARGET sed -i 's/START=.*/START=yes/' /etc/default/puppet
-      grml-chroot $TARGET puppet agent --test --waitforcert 30 2>&1 | tee -a /tmp/puppet.log
-      check_puppet_rc "${PIPESTATUS[0]}" "2"
-      ;;
-    jessie|stretch)
-      grml-chroot $TARGET puppet agent --enable 2>&1 | tee -a /tmp/puppet.log
-      check_puppet_rc "${PIPESTATUS[0]}" "0"
-      grml-chroot $TARGET puppet agent --test --tags core --waitforcert 30 2>&1 | tee -a /tmp/puppet.log
-      check_puppet_rc "${PIPESTATUS[0]}" "2"
-      grml-chroot $TARGET puppet agent --test --waitforcert 30 2>&1 | tee -a /tmp/puppet.log
-      check_puppet_rc "${PIPESTATUS[0]}" "2"
-      ;;
-  esac
-fi
+fi # if [ -n "$PUPPET" ] ; then
 
 # make sure we don't leave any running processes
 for i in asterisk atd collectd collectdmon dbus-daemon exim4 \