Updated scripts

Author: alvagante

Puppetfile

@@ -1,6 +1,6 @@
 # External modules to installed by r10k in modules/ dir
 # Here mostly at latest version for sample purposes.
-# In working environments specific versions should be defined.
+# In working environments specific fixed versions should be defined.
 
 # Here we place hieradata in a separated module.
 # We use control-repo branch if exists, or production as default
@@ -81,5 +81,8 @@ mod 'puppet/staging', :latest
 # mod 'counsyl/windows', :git => 'https://github.com/counsyl/puppet-windows'
 # mod 'trlinkin/domain_membership', :git => 'https://github.com/trlinkin/domain_membership'
 
+# Used by Mac profiles
+# mod 'thekevjames-homebrew', :latest
+
 # Used by psick::users when module=puppetlabs
 # mod 'puppetlabs/accounts', :latest

bin/bootstrap/tp_cli.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+PATH=/opt/puppetlabs/puppet/bin:$PATH
+
+if [ $USER == 'root' ]; then
+  sudo_command=''
+else
+  sudo_command='sudo '
+fi
+
+$sudo_command puppet module install example42-tp
+
+os=$(facter operatingsystem)
+local_user=$(whoami)
+case $os in
+  Darwin*)
+    $sudo_command puppet module install thekevjames-homebrew
+    $sudo_command puppet apply -e "class { homebrew: user => $local_user }"
+  ;;
+  Windows*)
+    $sudo_command puppet module install puppetlabs-chocolatey
+    $sudo_command puppet apply -e "include chocolately"
+  ;;
+esac
+
+$sudo_command puppet tp setup
+

bin/docker_setup.sh

@@ -5,6 +5,6 @@ repo_dir=$(git rev-parse --show-toplevel)
 puppet_options="--modulepath ${repo_dir}/site:${repo_dir}/modules:/etc/puppet/modules --environmentpath ${repo_dir} --hiera_config ${repo_dir}/hiera.yaml"
 
 echo_title "Going to install Docker"
-echo_subtitle "You will probably need superuser powers"
-puppet apply $puppet_options -e 'include docker'
+echo_subtitle "You need sudo powers. Executing: sudo -E puppet apply -e 'include psick::docker'"
+sudo -E puppet apply $puppet_options -e 'include psick ; include psick::docker'
 

bin/fabric_setup.sh

@@ -6,5 +6,7 @@ puppet_options="--modulepath ${repo_dir}/site:${repo_dir}/modules:/etc/puppet/mo
 
 echo_title "Going to install Fabric"
 echo_subtitle "Once installed run fab -l"
-puppet apply $puppet_options -e 'include psick::python::fabric'
+echo_subtitle "You need sudo powers. Executing: sudo -E puppet apply -e 'include psick::python::fabric'"
+
+sudo -E puppet apply $puppet_options -e 'include psick ; include psick::python::fabric'
 

bin/functions

@@ -84,3 +84,8 @@ shell_filter_strict () {
 #     echo $1 | sed "s/[^a-Z0-9_\-]//Ig"
 }
 
+if [ $USER == 'root' ]; then
+  sudo_command=''
+else
+  sudo_command='sudo '
+fi

bin/puppet_install.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 breed=$1
-
+if [ $USER == 'root' ]; then
+  sudo_command=''
+else
+  sudo_command='sudo '
+fi
 which tput >/dev/null 2>&1
 if [ "x${?}" == "x0" ]; then
   SETCOLOR_NORMAL=$(tput sgr0)
@@ -27,14 +31,14 @@ fi
 
 setup_redhat() {
   echo_title "Uninstalling existing Puppet"
-  yum erase -y puppet-agent puppet puppetlabs-release puppetlabs-release-pc1 >/dev/null 2>&1
+  $sudo_command yum erase -y puppet-agent puppet puppetlabs-release puppetlabs-release-pc1 >/dev/null 2>&1
 
   echo_title "Adding repo for Puppet 5"
-  rpm -ivh https://yum.puppetlabs.com/puppet5/puppet5-release-el-$1.noarch.rpm >/dev/null 2>&1
+  $sudo_command rpm -ivh https://yum.puppetlabs.com/puppet5/puppet5-release-el-$1.noarch.rpm >/dev/null 2>&1
 
   sleep 2
   echo_title "Installing Puppet"
-  yum install -y puppet-agent >/dev/null 2>&1
+  $sudo_command yum install -y puppet-agent >/dev/null 2>&1
 }
 
 setup_fedora() {
@@ -44,44 +48,44 @@ setup_fedora() {
     release='26'
   fi
   echo_title "Uninstalling existing Puppet"
-  yum erase -y puppet-agent puppet puppetlabs-release puppetlabs-release-pc1 >/dev/null 2>&1
+  $sudo_command yum erase -y puppet-agent puppet puppetlabs-release puppetlabs-release-pc1 >/dev/null 2>&1
 
   echo_title "Adding repo for Puppet 5"
-  rpm -ivh https://yum.puppetlabs.com/puppet5/puppet5-release-fedora-${release}.noarch.rpm
+  $sudo_command rpm -ivh https://yum.puppetlabs.com/puppet5/puppet5-release-fedora-${release}.noarch.rpm
 
   sleep 2
   echo_title "Installing Puppet"
-  yum install -y puppet-agent
+  $sudo_command yum install -y puppet-agent
 }
 
 setup_amazon() {
   echo_title "Uninstalling existing Puppet"
-  yum erase -y puppet-agent puppet puppetlabs-release puppetlabs-release-pc1 >/dev/null 2>&1
+  $sudo_command yum erase -y puppet-agent puppet puppetlabs-release puppetlabs-release-pc1 >/dev/null 2>&1
 
   echo_title "Adding repo for Puppet 4"
-  rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm >/dev/null 2>&1
-  yum-config-manager --enable epel
-  yum-config-manager --setopt="puppetlabs-pc1.priority=1" --save
+  $sudo_command rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm >/dev/null 2>&1
+  $sudo_command yum-config-manager --enable epel
+  $sudo_command yum-config-manager --setopt="puppetlabs-pc1.priority=1" --save
 
   sleep 2
   echo_title "Installing Puppet"
-  yum install -y puppet-agent >/dev/null 2>&1
+  $sudo_command yum install -y puppet-agent >/dev/null 2>&1
 }
 
 setup_suse() {
   echo_title "Uninstalling existing Puppet"
-  zypper remove -y puppet >/dev/null 2>&1
-  zypper remove -y puppet-agent >/dev/null 2>&1
-  zypper remove -y puppetlabs-release >/dev/null 2>&1
-  zypper remove -y puppetlabs-release-pc1 >/dev/null 2>&1
+  $sudo_command zypper remove -y puppet >/dev/null 2>&1
+  $sudo_command zypper remove -y puppet-agent >/dev/null 2>&1
+  $sudo_command zypper remove -y puppetlabs-release >/dev/null 2>&1
+  $sudo_command zypper remove -y puppetlabs-release-pc1 >/dev/null 2>&1
 
   echo_title "Adding repo for Puppet 5"
-  wget https://yum.puppetlabs.com/puppet5/puppet5-release-sles-$1.noarch.rpm 2>&1
-  rpm -ivh puppet5-release-sles-$1.noarch.rpm 2>&1
+  $sudo_command wget https://yum.puppetlabs.com/puppet5/puppet5-release-sles-$1.noarch.rpm 2>&1
+  $sudo_command rpm -ivh puppet5-release-sles-$1.noarch.rpm 2>&1
 
   sleep 2
   echo_title "Installing Puppet"
-  zypper --no-gpg-checks  --non-interactive install puppet-agent
+  $sudo_command zypper --no-gpg-checks  --non-interactive install puppet-agent
 }
 
 setup_apt() {
@@ -94,43 +98,42 @@ setup_apt() {
     12.04) codename=precise ;;
     14.04) codename=trusty  ;;
     16.04) codename=xenial ;;
-    18.04) codename=stretch ;; # Temporary fix, waiting for official repos
     *) echo "Release not supported" ;;
   esac
 
   echo_title "Adding repo for Puppet 5"
-  wget -q "http://apt.puppetlabs.com/puppet5-release-${codename}.deb" >/dev/null
-  dpkg -i "puppet5-release-${codename}.deb" >/dev/null
+  $sudo_command wget -q "http://apt.puppetlabs.com/puppet5-release-${codename}.deb" >/dev/null
+  $sudo_command dpkg -i "puppet5-release-${codename}.deb" >/dev/null
 
   echo_title "Running apt-get update"
-  apt-get update >/dev/null 2>&1
+  $sudo_command apt-get update >/dev/null 2>&1
 
   echo_title "Installing Puppet and its dependencies"
-  apt-get install -y puppet-agent -y >/dev/null
-  apt-get install -y apt-transport-https -y >/dev/null
+  $sudo_command apt-get install -y puppet-agent -y >/dev/null
+  $sudo_command apt-get install -y apt-transport-https -y >/dev/null
 }
 setup_alpine() {
   echo "## Adding repo for Ruby to /etc/apk/repositories"
   echo http://dl-4.alpinelinux.org/alpine/edge/testing/ >> /etc/apk/repositories
   echo "## Running apk update"
-  apk update
+  $sudo_command apk update
 
   echo "## Installing Puppet and its dependencies"
-  apk add shadow ruby less bash
-  gem install puppet --no-rdoc -no-ri
+  $sudo_command apk add shadow ruby less bash
+  $sudo_command gem install puppet --no-rdoc -no-ri
 }
 setup_solaris() {
   echo_title "Not yet supported"
 }
 setup_darwin() {
   majver=$(sw_vers -productVersion | cut -d '.' -f 1-2)
-  echo_title "Downloading package for version ${majver}"
-  curl -s -o puppet-agent.dmg "https://downloads.puppetlabs.com/mac/puppet5/${majver}/x86_64/puppet-agent-5.3.2-1.osx${majver}.dmg"
+  echo_title "Downloading package for MacOS version ${majver}"
+  curl -s -o puppet-agent.dmg "https://downloads.puppetlabs.com/mac/puppet5/${majver}/x86_64/puppet-agent-latest.dmg"
 
   echo_title "Installing Puppet Agent"
   hdiutil mount puppet-agent.dmg
   package=$(find /Volumes/puppet-agent*  | grep pkg)
-  installer -pkg $package -target /
+  $sudo_command installer -pkg $package -target /
   hdiutil unmount /Volumes/puppet-agent*
 }
 setup_bsd() {
@@ -205,11 +208,13 @@ os_detect() {
   esac
 }
 
+echo "Going to install Puppet (and eventually cleanup old version)"
+echo "If you are not root some commands will be run via sudo"
 if [ "x$breed" != "x" ]; then
   setup_$breed
 else
   os_detect
 fi
-[ -e /usr/bin/puppet ] || ln -fs /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
-[ -e /usr/bin/facter ] || ln -fs /opt/puppetlabs/puppet/bin/facter /usr/bin/facter
+[ -e /usr/bin/puppet ] || $sudo_command ln -fs /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
+[ -e /usr/bin/facter ] || $sudo_command ln -fs /opt/puppetlabs/puppet/bin/facter /usr/bin/facter
 

bin/puppet_setup.sh

@@ -4,7 +4,7 @@ script_dir="$(dirname $0)"
 # repo_dir=$(git rev-parse --show-toplevel)
 . "${script_dir}/functions"
 
-PATH=$PATH:/usr/local/bin
+PATH=/opt/puppetlabs/puppet/bin:$PATH
 if [ "$1" = "auto" ]; then
   auto=true
 fi
@@ -16,32 +16,32 @@ install_gems() {
   [ "$?" = 0 ] || return
 
   echo_title "Installing gems"
-  puppet resource package rubygems ensure=present
+  $sudo_command puppet resource package rubygems ensure=present
   which gem || echo "You need gem support! Install rubygems to continue successfully" 
   echo
-  echo_subtitle "Installing with /bin/gem"
-  gem install deep_merge --no-ri --no-rdoc
-  gem install hiera-eyaml --no-ri --no-rdoc
-  gem install r10k --no-ri --no-rdoc
+  echo_subtitle "Installing with gem"
+  $sudo_command gem install deep_merge --no-ri --no-rdoc
+  $sudo_command gem install hiera-eyaml --no-ri --no-rdoc
+  $sudo_command gem install r10k --no-ri --no-rdoc
   if [ -x /opt/puppetlabs/puppet/bin/gem ]; then
     echo_subtitle "Installing with /opt/puppetlabs/puppet/bin/gem"
-    /opt/puppetlabs/puppet/bin/gem install deep_merge --no-ri --no-rdoc
-    /opt/puppetlabs/puppet/bin/gem install hiera-eyaml --no-ri --no-rdoc
-    /opt/puppetlabs/puppet/bin/gem install r10k --no-ri --no-rdoc
+    $sudo_command /opt/puppetlabs/puppet/bin/gem install deep_merge --no-ri --no-rdoc
+    $sudo_command /opt/puppetlabs/puppet/bin/gem install hiera-eyaml --no-ri --no-rdoc
+    $sudo_command /opt/puppetlabs/puppet/bin/gem install r10k --no-ri --no-rdoc
   fi
   if [ -x /opt/puppetlabs/bin/puppetserver ]; then
     echo_subtitle "Installing with /opt/puppetlabs/bin/puppetserver"
-    /opt/puppetlabs/bin/puppetserver gem install deep_merge
-    /opt/puppetlabs/bin/puppetserver gem install hiera-eyaml
-    /opt/puppetlabs/bin/puppetserver gem install r10k
+    $sudo_command /opt/puppetlabs/bin/puppetserver gem install deep_merge
+    $sudo_command /opt/puppetlabs/bin/puppetserver gem install hiera-eyaml
+    $sudo_command /opt/puppetlabs/bin/puppetserver gem install r10k
   fi
 }
 
 install_rsync() {
   echo_title "Installing rsync"
-  [ "$auto" = "true" ] || ask_interactive "Can we install rsync? Note: You need sudo powers"
+  [ "$auto" = "true" ] || ask_interactive "Can we install rsync?"
   [ "$?" = 0 ] || return
-  sudo -E puppet resource package rsync ensure=present
+  $sudo_command puppet resource package rsync ensure=present
 }
 
 install_modules() {

bin/setup.sh

@@ -2,44 +2,37 @@
 repo_dir="$(dirname $0)/.."
 script_dir="$(dirname $0)"
 . "${script_dir}/functions"
+PATH=/opt/puppetlabs/puppet/bin:$PATH
 
 [ "$1" = "auto" ] && auto=true || auto=false
 
 puppet_options="--modulepath ${repo_dir}/site:${repo_dir}/modules:/etc/puppet/modules --environmentpath ${repo_dir}"
 
 setup_puppet() {
   echo_title "Setting up Puppet environment"
-  if [ "$auto" = "true" ]; then
+  if [ "$auto" == "true" ]; then
     "${script_dir}/puppet_setup.sh" auto
   else
     "${script_dir}/puppet_setup.sh"
   fi
 }
 
 install_fabric() {
-  [ "$auto" = "true" ] || ask_interactive "Going to install Fabric via Puppet"
+  [ "$auto" == "true" ] || ask_interactive "Going to install Fabric via Puppet"
   [ "$?" = 0 ] || return
-  echo_title "Installing Fabric"
-  echo_subtitle "Executing: sudo puppet apply -e 'include ::psick::python::fabric'"
-  sudo -E puppet apply $puppet_options -e 'include psick ; include ::psick::python::fabric'
+  "${script_dir}/fabric_setup.sh"
 }
 
 install_vagrant() {  
   [ "$auto" = "true" ] || ask_interactive "Going to install Vagrant via Puppet"
   [ "$?" = 0 ] || return
-  echo_title "Installing Vagrant"
-  echo_subtitle "Executing: sudo puppet apply -e 'include psick ; include ::psick::vagrant'"
-  sudo -E puppet apply $puppet_options -e 'include psick ; include ::psick::vagrant'
-  echo_subtitle "Executing: puppet apply -e 'include psick ; include ::psick::vagrant::plugins'"
-  sudo -E puppet apply $puppet_options -e 'include psick ; include ::psick::vagrant::plugins'
+  "${script_dir}/vagrant_setup.sh"
 }
 
 install_docker() { 
   [ "$auto" = "true" ] || ask_interactive "Going to install Docker via Puppet"
   [ "$?" = 0 ] || return
-  echo_title "Installing Docker"
-  echo_subtitle "Executing: sudo puppet apply -e 'include psick ; include ::psick::docker'"
-  sudo -E puppet apply $puppet_options -e 'include psick ; include ::psick::docker'
+  "${script_dir}/docker_setup.sh"
 }
 
 setup_puppet

bin/vagrant_setup.sh

@@ -5,5 +5,6 @@ repo_dir=$(git rev-parse --show-toplevel)
 puppet_options="--modulepath ${repo_dir}/site:${repo_dir}/modules:/etc/puppet/modules --environmentpath ${repo_dir}"
 
 echo_title "Going to install vagrant and the needed plugins"
-puppet apply $puppet_options -e 'include psick::vagrant::plugins'
+echo_subtitle "Executing: sudo -E puppet apply -e 'include psick::vagrant'"
+sudo -E puppet apply $puppet_options -e 'include psick::vagrant'