falkorlib 0.7.8 → 0.7.9

data/templates/puppet/modules/metadata.json.erb

@@ -21,11 +21,23 @@
   ],
   "operatingsystem_support": [
     {
-      "operatingsystem": "Debian",
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
         "7"
       ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "7",
+        "8"
+      ]
     }
   ],
   "tags": <%= config[:tags] %>

data/templates/puppet/modules/mkdocs.yml.erb

@@ -1,12 +1,14 @@
 site_name: <%= config[:name] %> Puppet Module
 pages:
-- ['index.md', 'Home']
-- ['overview.md', 'Overview']
-- ['vagrant.md', 'Tests with Vagrant']
-- ['contributing/index.md', 'Contributing', 'Overview']
-- ['contributing/layout.md', 'Contributing', 'Directory Layout']
-- ['contributing/setup.md', 'Contributing', 'Repository Setup and Developments']
-- ['contributing/versioning.md', 'Contributing', 'Module Versioning']
-- ['rtfd.md', 'Documentation', 'RTFD']
-- ['contacts.md', 'Contacts']
+- Home: 'index.md'
+- Overview: 'overview.md'
+- Tests with Vagrant: 'vagrant.md'
+- Contributing:
+  - Overview: 'contributing/index.md'
+  - Directory Layout: 'contributing/layout.md'
+  - Repository Setup and Developments: 'contributing/setup.md'
+  - Module Versioning: 'contributing/versioning.md'
+- Documentation:
+  - RTFD: 'rtfd.md'
+- Contacts: 'contacts.md'
 theme: readthedocs

data/templates/puppet/modules/tests/init.pp.erb

@@ -16,5 +16,5 @@
 #      sudo puppet apply -t /vagrant/tests/init.pp
 #
 node default {
-    include <%= config[:shortname] %>
+    include ::<%= config[:shortname] %>
 }

data/templates/puppet/modules/tests/vagrant/bootstrap.sh

@@ -0,0 +1,229 @@
+#!/usr/bin/env bash
+# Time-stamp: <Sun 2017-08-20 19:08 svarrette>
+###########################################################################################
+# __     __                          _     ____              _       _
+# \ \   / /_ _  __ _ _ __ __ _ _ __ | |_  | __ )  ___   ___ | |_ ___| |_ _ __ __ _ _ __
+#  \ \ / / _` |/ _` | '__/ _` | '_ \| __| |  _ \ / _ \ / _ \| __/ __| __| '__/ _` | '_ \
+#   \ V / (_| | (_| | | | (_| | | | | |_  | |_) | (_) | (_) | |_\__ \ |_| | | (_| | |_) |
+#    \_/ \__,_|\__, |_|  \__,_|_| |_|\__| |____/ \___/ \___/ \__|___/\__|_|  \__,_| .__/
+#              |___/                                                              |_|
+#                  Copyright (c) 2017 UL HPC Team <hpc-sysadmins@uni.lu>
+###########################################################################################
+# ULHPC (prefered) way to see a Vagrant box configured.
+#
+
+SETCOLOR_NORMAL=$(tput sgr0)
+SETCOLOR_TITLE=$(tput setaf 6)
+SETCOLOR_SUBTITLE=$(tput setaf 14)
+SETCOLOR_RED=$(tput setaf 1)
+SETCOLOR_BOLD=$(tput setaf 15)
+
+### Local variables
+STARTDIR="$(pwd)"
+SCRIPTFILENAME=$(basename $0)
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+MOTD="/etc/motd"
+DOTFILES_DIR='/etc/dotfiles.d'
+DOTFILES_URL='https://github.com/ULHPC/dotfiles.git'
+SUPPORT_MAIL='hpc-sysadmins@uni.lu'
+EXTRA_PACKAGES=
+
+# List of default packages to install
+COMMON_DEFAULT_PACKAGES="ruby wget figlet git screen bash-completion rsync vim"
+
+GEMS="librarian-puppet falkorlib"
+
+######
+# Print information in the following form: '[$2] $1' ($2=INFO if not submitted)
+# usage: info text [title]
+##
+info () {
+    echo
+    echo "${SETCOLOR_BOLD}###${SETCOLOR_NORMAL} ${SETCOLOR_TITLE}${1}${SETCOLOR_NORMAL} ${SETCOLOR_BOLD}###${SETCOLOR_NORMAL}"
+}
+error() {
+    echo
+    echo "${SETCOLOR_RED}*** ERROR *** $*${SETCOLOR_NORMAL}"
+    exit 1
+}
+
+print_usage() {
+    cat <<EOF
+    $0 [--name "vagrant box name"] \
+       [--title "Title"] \
+       [--subtitle "Subtitle"] \
+       [--desc "description"] \
+       [--support "support@mail.com"]
+       [-x "pkg1 pkg2 ..."]
+
+Bootstrap a Vagrant box
+This will generate the appropriate ${MOTD} file
+EOF
+}
+
+#######################  Per OS Bootstrapping function ##########################
+setup_redhat() {
+    info "Running yum update"
+    yum update -y  >/dev/null
+
+    info "Installing default packages"
+    yum install -y epel-release
+    yum install -y ${COMMON_DEFAULT_PACKAGES} ruby-devel bind-utils ${EXTRA_PACKAGES}  >/dev/null
+
+    info "Uninstalling (eventually) existing Puppet installation"
+    yum erase -y puppet puppetlabs-release >/dev/null
+
+    info "Adding repo for Puppet 4"
+    rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-pc1-el-$1.noarch.rpm
+
+    sleep 1
+    info "Installing Puppet and its dependencies"
+    yum install -y puppet-agent >/dev/null
+}
+
+setup_apt() {
+    case $1 in
+        3*) codename=cumulus ;;
+        6)  codename=squeeze ;;
+        7)  codename=wheezy ;;
+        8)  codename=jessie  ;;
+        9)  codename=stretch  ;;
+        12.04) codename=precise ;;
+        14.04) codename=trusty  ;;
+        16.04) codename=xenial ;;
+        *) echo "Release not supported" ;;
+    esac
+
+    info "Adding repo for Puppet 4"
+    wget -q "http://apt.puppetlabs.com/puppetlabs-release-pc1-${codename}.deb" >/dev/null
+    dpkg -i "puppetlabs-release-pc1-${codename}.deb" >/dev/null
+
+    info "Running apt-get update"
+    apt-get update >/dev/null 2>&1
+
+    info "Installing default packages"
+    apt-get install -y ${COMMON_DEFAULT_PACKAGES} git-core rubygems ${EXTRA_PACKAGES}  >/dev/null
+
+    info "Installing Puppet and its dependencies"
+    apt-get install puppet-agent -y >/dev/null
+    apt-get install apt-transport-https -y >/dev/null
+}
+
+setup_linux() {
+    ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
+    if [ -f /etc/redhat-release ]; then
+        OS=$(cat /etc/redhat-release | cut -d ' ' -f 1)
+        majver=$(cat /etc/redhat-release | sed 's/[A-Za-z]*//g' | sed 's/ //g' | cut -d '.' -f 1)
+    elif [ -f /etc/SuSE-release ]; then
+        OS=sles
+        majver=$(cat /etc/SuSE-release | grep VERSION | cut -d '=' -f 2 | tr -d '[:space:]')
+    elif [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS=$ID
+        majver=$VERSION_ID
+    elif [ -f /etc/debian_version ]; then
+        OS=Debian
+        majver=$(cat /etc/debian_version | cut -d '.' -f 1)
+    elif [ -f /etc/lsb-release ]; then
+        . /etc/lsb-release
+        OS=$DISTRIB_ID
+        majver=$DISTRIB_RELEASE
+    elif [ -f /etc/os-release ]; then
+        . /etc/os-release
+        OS=$ID
+        majver=$VERSION_ID
+    else
+        OS=$(uname -s)
+        majver=$(uname -r)
+    fi
+    distro=$(echo $OS | tr '[:upper:]' '[:lower:]')
+    info "Detected Linux distro: ${distro} version ${majver} on arch ${ARCH}"
+    case "$distro" in
+        debian|ubuntu) setup_apt $majver ;;
+        redhat|fedora|centos|scientific|amazon) setup_redhat $majver ;;
+        *) echo "Not supported distro: $distro"; exit 1;;
+    esac
+
+}
+
+setup_dotfiles () {
+    if [ ! -d "${DOTFILES_DIR}" ]; then
+        info "cloning ULHPC/dotfiles repository in '/etc/dotfiles.d"
+        git clone ${DOTFILES_URL} ${DOTFILES_DIR}
+    fi
+    # Correct __git_ps1
+    local src_git_prompt="/usr/share/git-core/contrib/completion/git-prompt.sh"
+    local dst_git_prompt="/etc/profile.d/git-prompt.sh"
+    if [ -f "${src_git_prompt}" ]; then
+        info "installing git-prompt to define __git_ps1"
+        [ ! -e "${dst_git_prompt}" ] && ln -s ${src_git_prompt} ${dst_git_prompt}
+    fi
+    local dotfile_install_cmd="${DOTFILES_DIR}/install.sh --offline --force -d ${DOTFILES_DIR} --bash --screen"
+    if [ -d "${DOTFILES_DIR}" ]; then
+        info "installing dotfiles for 'root' user"
+        ${dotfile_install_cmd}
+        info "installing dotfiles for 'vagrant' user"
+        sudo -u vagrant ${dotfile_install_cmd}
+    fi
+}
+
+setup_motd() {
+    local motd=/etc/motd
+    local has_figlet=$(which figlet 2>/dev/null)
+    info "setup ${motd}"
+    cat <<EOF > ${motd}
+================================================================================
+ Welcome to the Vagrant box $(hostname)
+================================================================================
+EOF
+    if [ -n "${has_figlet}" ]; then
+        cat <<EOF >> ${motd}
+$(${has_figlet} -w 80 -c "$(hostname -s)")
+EOF
+    fi
+    cat <<EOF >> ${motd}
+================================================================================
+    Hostname.... $(hostname -f)
+    OS.......... $(facter os.name) $(facter os.release.full)
+    Support..... ${SUPPORT_MAIL}
+    Docs........ Vagrant: http://docs.vagrantup.com/v2/
+================================================================================
+EOF
+}
+
+setup_gems() {
+    sudo gem install --no-ri --no-rdoc ${GEMS}
+}
+
+######################################################################################
+[ $UID -gt 0 ] && error "You must be root to execute this script (current uid: $UID)"
+
+
+# Parse the command-line options
+while [ $# -ge 1 ]; do
+    case $1 in
+        -h | --help)    print_usage;       exit 0;;
+        -V | --version) print_version;     exit 0;;
+        -n | --name)      shift; NAME=$1;;
+        -t | --title)     shift; TITLE=$1;;
+        -st| --subtitle)  shift; SUBTITLE=$1;;
+        -d | --desc)      shift; DESC=$1;;
+        -s | --support)   shift; SUPPORT_MAIL=$1;;
+        -x | --extras)    shift; EXTRA_PACKAGES=$1;;
+    esac
+    shift
+done
+
+# Let's go
+case "$OSTYPE" in
+    linux*)   setup_linux ;;
+    *)        echo "unknown: $OSTYPE"; exit 1;;
+esac
+
+[ -f /usr/bin/puppet ] || ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
+[ -f /usr/bin/facter ] || ln -s /opt/puppetlabs/puppet/bin/facter /usr/bin/facter
+
+setup_dotfiles
+setup_motd
+setup_gems

data/templates/puppet/modules/tests/vagrant/config.yaml

@@ -0,0 +1,51 @@
+# -*- mode: yaml; -*-
+# Time-stamp: <Mon 2017-08-21 23:15 svarrette>
+################################################################################
+# Complementary configuration for Vagrant
+# You can overwrite here the default settings defined in ../../Vagrantfile and
+# define additional VMs (agents) to deploy upon vagrant up (in addition to the
+# puppet master 'master')
+
+#___________________________________________
+# Complete / re-define the default boxes below
+# Format:
+#   :<os><version>: <username>/<box> # see https://vagrantcloud.com
+# :boxes:
+#   :windows2012: 'opentable/win-2012r2-standard-amd64-nocm'
+#   :freebsd12:   'freebsd/FreeBSD-12.0-RELEASE'
+#   :centos7:     'centos/7',
+#   :debian8:     'debian/contrib-jessie64',
+#   :ubuntu14:    'ubuntu/trusty64'
+
+#_________________
+# Default settings
+# :defaults:
+#   :os: :centos7         # Default OS from the above box definition
+#   :ram: 512             # Default RAM
+#   :vcpus: 1             # Default number of virtual CPUs
+#   :vbguest_auto_update: 1  # check/update box guest additions
+
+#____________________
+# Network settings
+# :network:
+#   :domain: 'vagrant.dev'      # network domain to use
+#   :range: '10.10.1.0/24'      # IP range to use
+#   :ip_offset: 10
+#   # client / VMs defined below will start on xx.xx.xx.<ip_offset>
+
+#___________________________________________________________
+# VMs / Vagrant boxes to define apart from the puppet master
+# Format:
+# <name>:
+#   :hostname: <hostname>
+#   :desc: <VM-description>
+#   :os: <os>
+#   :ram: <ram>
+#   :vcpus: <vcpus>
+#   :role: <role>
+#   :roles:
+#     - <role1>
+#     - <role2>
+# :vms:
+#   'default':
+#     :os: :debian8

data/templates/puppet/modules/tests/vagrant/puppet_modules_setup.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+##########################################################################
+# puppet_module_setup.rb
+# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# Time-stamp: <Mon 2017-08-21 13:01 svarrette>
+#
+# @description Prepare the Vagrant box to test this Puppet module
+#
+# Copyright (c) 2014-2017 Sebastien Varrette <Sebastien.Varrette@uni.lu>
+# .             http://varrette.gforge.uni.lu
+##############################################################################
+
+require 'json'
+require 'yaml'
+require 'falkorlib'
+
+include FalkorLib::Common
+
+# Load metadata
+basedir   = File.directory?('/vagrant') ? '/vagrant' : Dir.pwd
+jsonfile  = File.join( basedir, 'metadata.json')
+puppetdir = '/etc/puppetlabs'
+
+error "Unable to find the metadata.json" unless File.exists?(jsonfile)
+
+metadata   = JSON.parse( IO.read( jsonfile ) )
+name = metadata["name"].gsub(/^[^\/-]+[\/-]/,'')
+modulepath=`puppet config print modulepath`.chomp
+moduledir=modulepath.split(':').first
+
+
+run %{ cd #{moduledir}/.. && librarian-puppet clean && rm Puppetfile* }
+run %{ ln -s /vagrant/metadata.json #{moduledir}/../ }
+run %{ cd #{moduledir}/.. && librarian-puppet install --verbose }
+
+
+# metadata["dependencies"].each do |dep|
+# 	lib = dep["name"]
+#     shortname = lib.gsub(/^.*[\/-]/,'')
+#     action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade --force' : 'install'
+# 	run %{ puppet module #{action} #{lib} }
+# end
+
+puts "Module path: #{modulepath}"
+puts "Moduledir:   #{moduledir}"
+
+info "set symlink to the '#{basedir}' module for local developments"
+run %{ ln -s #{basedir} #{moduledir}/#{name}  } unless File.exists?("#{moduledir}/#{name}")
+
+# Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5
+hiera = '/etc/puppetlabs/puppet/hiera.yaml'
+
+
+
+
+# Prepare hiera
+# unless File.exists?('/etc/puppet/hiera.yaml')
+#     run %{ ln -s /etc/hiera.yaml /etc/puppet/hiera.yaml } if File.exists?("/etc/hiera.yaml")
+# end
+# # # hieracfg = YAML::load_file('/etc/hiera.yaml')
+# # # [ '/vagrant/tests/hiera' ].each do |d|
+# # #     hieracfg[:datadir] = [] if hieracfg[:datadir].nil?
+# # #     hieracfg[:datadir] << d #if File.directory?('#{d}')
+# # # end
+# # # hieracfg[:hierarchy] = [] if hieracfg[:hierarchy].nil?
+# # # hieracfg[:hierarchy] << 'common' unless hieracfg[:hierarchy].include?('common')
+# hieracfg = {
+#     :backends  => [ 'yaml' ],
+#     :hierarchy => [ 'defaults', 'common' ],
+#     :yaml      => {
+#         :datadir   => '/vagrant/tests/hiera',
+#     }
+# }
+# FalkorLib::Common.store_config('/etc/hiera.yaml', hieracfg, {:no_interaction => true})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falkorlib
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Sebastien Varrette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -522,7 +522,6 @@ files:
 - templates/motd/motd.erb
 - templates/puppet/modules/.gitignore
 - templates/puppet/modules/.pmtignore
-- templates/puppet/modules/.vagrant_init.rb
 - templates/puppet/modules/Gemfile
 - templates/puppet/modules/README.md.erb
 - templates/puppet/modules/Rakefile
@@ -548,6 +547,9 @@ files:
 - templates/puppet/modules/templates/templatename-variables.erb
 - templates/puppet/modules/tests/init.pp.erb
 - templates/puppet/modules/tests/params.pp.erb
+- templates/puppet/modules/tests/vagrant/bootstrap.sh
+- templates/puppet/modules/tests/vagrant/config.yaml
+- templates/puppet/modules/tests/vagrant/puppet_modules_setup.rb
 homepage: https://github.com/Falkor/falkorlib
 licenses:
 - MIT

data/templates/puppet/modules/.vagrant_init.rb

@@ -1,67 +0,0 @@
-#!/usr/bin/env ruby 
-##########################################################################
-# vagrant_init.rb
-# @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Tue 2015-06-02 22:43 svarrette>
-#
-# @description 
-#
-# Copyright (c) 2014 Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# .             http://varrette.gforge.uni.lu
-##############################################################################
-
-require 'json'
-require 'yaml'
-require 'falkorlib'
-
-include FalkorLib::Common
-
-# Load metadata
-basedir   = File.directory?('/vagrant') ? '/vagrant' : Dir.pwd
-jsonfile  = File.join( basedir, 'metadata.json')
-
-error "Unable to find the metadata.json" unless File.exists?(jsonfile)
-
-metadata   = JSON.parse( IO.read( jsonfile ) )
-name = metadata["name"].gsub(/^[^\/-]+[\/-]/,'') 
-modulepath=`puppet config print modulepath`.chomp
-moduledir=modulepath.split(':').first
-
-
-run %{ cd /etc/puppet && librarian-puppet clean && rm Puppetfile* }
-run %{ ln -s /vagrant/metadata.json /etc/puppet/ }
-run %{ cd /etc/puppet && librarian-puppet install --verbose }
-
-
-# metadata["dependencies"].each do |dep|
-# 	lib = dep["name"]
-#     shortname = lib.gsub(/^.*[\/-]/,'')
-#     action = File.directory?("#{moduledir}/#{shortname}") ? 'upgrade --force' : 'install'
-# 	run %{ puppet module #{action} #{lib} } 
-# end
-
-puts "Module path: #{modulepath}"
-puts "Moduledir:   #{moduledir}" 
-
-info "set symlink to the '#{basedir}' module for local developments"
-run %{ ln -s #{basedir} #{moduledir}/#{name}  } unless File.exists?("#{moduledir}/#{name}")
-
-# Prepare hiera
-unless File.exists?('/etc/puppet/hiera.yaml')
-    run %{ ln -s /etc/hiera.yaml /etc/puppet/hiera.yaml } if File.exists?("/etc/hiera.yaml")
-end
-# # hieracfg = YAML::load_file('/etc/hiera.yaml')
-# # [ '/vagrant/tests/hiera' ].each do |d|
-# #     hieracfg[:datadir] = [] if hieracfg[:datadir].nil?
-# #     hieracfg[:datadir] << d #if File.directory?('#{d}')
-# # end
-# # hieracfg[:hierarchy] = [] if hieracfg[:hierarchy].nil?
-# # hieracfg[:hierarchy] << 'common' unless hieracfg[:hierarchy].include?('common')
-hieracfg = {
-    :backends  => [ 'yaml' ],
-    :hierarchy => [ 'defaults', 'common' ],
-    :yaml      => {
-        :datadir   => '/vagrant/tests/hiera',
-    }
-}
-FalkorLib::Common.store_config('/etc/hiera.yaml', hieracfg, {:no_interaction => true})