falkorlib 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 554b1778c0f221f9e35a3d07227bb29b731607eb
-  data.tar.gz: 684ead60778ae61ae7a4d973b0b12a3e94d7ce8a
+  metadata.gz: 4044cdff596230756f97b5f314ca6eb070bca2b7
+  data.tar.gz: 7471302188008c453c5779c472e02b05291dcdd3
 SHA512:
-  metadata.gz: 32770c26be0b2c664b3ac5a57445e898c628a003895e6ef352fb8ebbf607e85cec326f07f09232e6b4960107c88c209b2938a5d609914586e3eccb947f34a8ec
-  data.tar.gz: 5ac8a060f15f35838b390e2709265fc4053635833aee10cb4d156cb72163de6ea988ccc169ac791a309c269df1dbd6914261b103a0169c536f29d63f86b57216
+  metadata.gz: 095e102b8251833b0cd687a8e1a90381e18b4fbcf3fb5d31eab8b2dfcdc0e4e3a5b2faa59cfc0b6e0f0f585bd55e657d33d71932b2779967c7f45632e830db4e
+  data.tar.gz: 266198ac0d9be7c6edf2b0a7ed12a1e37508fea1da6a9e510722845273ed1a3e347b367f71a8da860b07570284090f3cd710392e303a998c9894ff5fa75bccfd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    falkorlib (0.7.8)
+    falkorlib (0.7.9)
       activesupport (~> 4.0)
       artii (>= 2.1)
       awesome_print (~> 1.2)

data/lib/falkorlib/puppet/modules.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ################################################################################
-# Time-stamp: <Sat 2016-11-12 12:18 svarrette>
+# Time-stamp: <Wed 2017-08-23 15:36 svarrette>
 ################################################################################
 # Interface for the main Puppet Module operations
 #
@@ -132,7 +132,7 @@ module FalkorLib #:nodoc:
         config[:platforms] = [ 'debian' ]
         config[:dependencies] = [{
           "name" => "puppetlabs-stdlib",
-          "version_requirement" => ">=4.2.2 <5.0.0"
+          "version_requirement" => ">=4.19.0 <5.0.0"
         }]
         config[:params] = %w(ensure protocol port packagename)
         #ap config
@@ -173,7 +173,7 @@ module FalkorLib #:nodoc:
           [ 'metadata.json',
             'docs/', 'mkdocs.yml', 'LICENSE', '.gitignore', '.pmtignore',
             '.ruby-version', '.ruby-gemset', 'Gemfile',
-            '.vagrant_init.rb', 'Rakefile', 'Vagrantfile' ].each do |f|
+            'tests/vagrant/', 'Rakefile', 'Vagrantfile' ].each do |f|
             FalkorLib::Git.add(File.join(moduledir, f))
           end
         end
@@ -306,7 +306,7 @@ module FalkorLib #:nodoc:
           'docs/contributing/index.md', 'docs/contributing/layout.md', 'docs/contributing/setup.md', 'docs/contributing/versioning.md',
           'docs/index.md', 'docs/rtfd.md', 'docs/vagrant.md'
         ]
-        (update_from_erb + [ 'Gemfile', 'Rakefile', 'Vagrantfile', '.vagrant_init.rb' ]).each do |f|
+        (update_from_erb + [ 'Gemfile', 'Rakefile', 'Vagrantfile', 'tests/vagrant/bootstrap.sh', 'tests/vagrant/config.yaml', 'tests/vagrant/puppet_modules_setup.rb' ]).each do |f|
           next unless options[:exclude].nil? || !options[:exclude].include?( f )
           next unless options[:only].nil?    || options[:only].include?(f)
           info "Upgrade the content of #{f}"

data/lib/falkorlib/version.rb

@@ -19,7 +19,7 @@ module FalkorLib #:nodoc:
     # MAJOR: Defines the major version
     # MINOR: Defines the minor version
     # PATCH: Defines the patch version
-    MAJOR, MINOR, PATCH = 0, 7, 8
+    MAJOR, MINOR, PATCH = 0, 7, 9
 
     module_function
 

data/spec/falkorlib/puppet_modules_spec.rb

@@ -2,7 +2,7 @@
 #########################################
 # puppet_modules_spec.rb
 # @author Sebastien Varrette <Sebastien.Varrette@uni.lu>
-# Time-stamp: <Thu 2016-11-10 02:01 svarrette>
+# Time-stamp: <Wed 2017-08-23 15:39 svarrette>
 #
 # @description Check the Puppet Modules operations
 #
@@ -156,7 +156,7 @@ describe FalkorLib::Puppet::Modules do
     #                      ])
     # end
 
-    upgraded_files_default = 1
+    upgraded_files_default = 5
     it "#upgrade" do
       d = FalkorLib::Puppet::Modules.upgrade(moduledir, {
                                                :no_interaction => true

data/templates/puppet/modules/Gemfile

@@ -4,10 +4,45 @@ source "https://rubygems.org"
 gem 'falkorlib' #, :path => '~/git/github.com/Falkor/falkorlib'
 
 # Puppet stuff
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
-gem "puppet", puppetversion
 #gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-lint',            '>= 0.3.2'
-gem 'puppet-syntax'
-gem 'facter',                 '>= 1.7.0'
-gem 'rspec-puppet'
+
+#gem 'puppet-syntax'
+#gem 'facter',                 '>= 1.7.0'
+
+group :test do
+  gem "rake"
+  gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 4.4.0'
+  gem "rspec", '< 3.2.0'
+  gem "rspec-puppet"
+  gem "puppetlabs_spec_helper"
+  gem "metadata-json-lint"
+  gem "rspec-puppet-facts"
+  gem 'rubocop', '0.33.0'
+  gem 'simplecov', '>= 0.11.0'
+  gem 'simplecov-console'
+
+  #gem 'puppet-lint',            '>= 0.3.2'
+  gem "puppet-lint-absolute_classname-check"
+  gem "puppet-lint-leading_zero-check"
+  gem "puppet-lint-trailing_comma-check"
+  gem "puppet-lint-version_comparison-check"
+  gem "puppet-lint-classes_and_types_beginning_with_digits-check"
+  gem "puppet-lint-unquoted_string-check"
+  gem 'puppet-lint-resource_reference_syntax'
+  gem 'semantic_puppet'
+
+  gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
+end
+
+group :development do
+  gem "travis"              if RUBY_VERSION >= '2.1.0'
+  gem "travis-lint"         if RUBY_VERSION >= '2.1.0'
+ # gem "puppet-blacksmith"
+ # gem "guard-rake"          if RUBY_VERSION >= '2.2.5' # per dependency https://rubygems.org/gems/ruby_dep
+end
+
+group :system_tests do
+  gem "beaker"
+  gem "beaker-rspec"
+  gem "beaker-puppet_install_helper"
+end

data/templates/puppet/modules/Rakefile

@@ -1,7 +1,23 @@
-#
+##############################################################################
 # Rakefile - Configuration file for rake (http://rake.rubyforge.org/)
+# Time-stamp: <Wed 2017-08-23 15:17 svarrette>
+#
+# Copyright (c) 2017  UL HPC Team <hpc-sysadmins@uni.lu>
+#                       ____       _         __ _ _
+#                      |  _ \ __ _| | _____ / _(_) | ___
+#                      | |_) / _` | |/ / _ \ |_| | |/ _ \
+#                      |  _ < (_| |   <  __/  _| | |  __/
+#                      |_| \_\__,_|_|\_\___|_| |_|_|\___|
+#
+# Use 'rake -T' to list the available actions
 #
+# Resources:
+# * http://www.stuartellis.eu/articles/rake/
+#
+# See also https://github.com/garethr/puppet-module-skeleton
+##############################################################################
 require 'falkorlib'
+require 'puppetlabs_spec_helper/rake_tasks'
 
 ## placeholder for custom configuration of FalkorLib.config.*
 ## See https://github.com/Falkor/falkorlib
@@ -13,16 +29,15 @@ end
 
 # Adapt the Git flow aspects
 FalkorLib.config.gitflow do |c|
-	c[:branches] = { 
+	c[:branches] = {
 		:master  => 'production',
 		:develop => 'devel'
-	} 
+	}
 end
 
- 
+
 require 'falkorlib/tasks/git'
-require 'falkorlib/tasks/puppet'
+#require 'falkorlib/tasks/puppet'
 
 ##############################################################################
 #TOP_SRCDIR = File.expand_path(File.join(File.dirname(__FILE__), "."))
-

data/templates/puppet/modules/Vagrantfile

@@ -1,50 +1,140 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
+# Time-stamp: <Tue 2017-08-22 23:58 svarrette>
+###########################################################################################
+#              __     __                          _    __ _ _
+#              \ \   / /_ _  __ _ _ __ __ _ _ __ | |_ / _(_) | ___
+#               \ \ / / _` |/ _` | '__/ _` | '_ \| __| |_| | |/ _ \
+#                \ V / (_| | (_| | | | (_| | | | | |_|  _| | |  __/
+#                 \_/ \__,_|\__, |_|  \__,_|_| |_|\__|_| |_|_|\___|
+#                           |___/
+###########################################################################################
+require 'yaml'
+require 'ipaddr'
+require 'deep_merge'
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
+TOP_SRCDIR = File.expand_path File.dirname(__FILE__)
+TOP_VAGRANT_TESTDIR  = File.join(TOP_SRCDIR, 'tests', 'vagrant')
+config_file   = File.join(TOP_VAGRANT_TESTDIR, 'config.yaml')
 
+###### Expected Vagrant plugins detection ######
+# For more information on the below plugins:
+# - https://github.com/oscar-stack/vagrant-hosts
+# - https://github.com/dotless-de/vagrant-vbguest
+# - https://github.com/emyl/vagrant-triggers
+# - https://github.com/fgrehm/vagrant-cachier
+# Terminal-table is a nice ruby gem for automatically print tables with nice layout
+###
+[ 'vagrant-hosts', 'vagrant-vbguest', 'vagrant-triggers', 'vagrant-cachier', 'terminal-table' ].each do |plugin|
+    abort "Install the  '#{plugin}' plugin with 'vagrant plugin install #{plugin}'" unless Vagrant.has_plugin?("#{plugin}")
+end
+require 'terminal-table'
+
+### Default settings ###
+DEFAULT_SETTINGS = {
+    :defaults => {
+        :os     => :centos7,
+        :ram    => 512,
+        :vcpus  => 4,
+        :vbguest_auto_update => true,
+    },
+    # Default domain settings
+    :network => {
+        :domain => 'vagrant.dev',
+        :range  => '10.10.1.0/24',
+        :ip_offset => 10,
+    },
+    # Default Boxes
+    :boxes => {
+        :centos7  => 'centos/7',
+        :debian8  => 'debian/contrib-jessie64',
+        :ubuntu14 => 'ubuntu/trusty64'
+    },
+    :vms => {
+        'default' => { }
+    },
+}
+
+# List of default provisioning scripts
+DEFAULT_PROVISIONING_SCRIPTS = [
+    "tests/vagrant/bootstrap.sh",
+    "tests/vagrant/puppet_modules_setup.rb"
+]
+
+# Load the settings (eventually overwritten using values from the yaml file 'config.yaml')
+settings = DEFAULT_SETTINGS.clone
+if File.exist?(config_file)
+    config = YAML::load_file config_file
+    settings.deep_merge!( config ) if config
+end
+abort "Undefined settings" if settings.nil?
+
+
+############################################################
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    # Inspired by [puppet-playground](https://github.com/example42/puppet-playground/blob/master/Vagrantfile)
-    #config.cache.auto_detect = true
-
-    # (nearly) All below boxes were generated using [vagrant-vms](https://github.com/Falkor/vagrant-vms/)
-    {
-        :centos_7 => {
-            :box => "svarrette/centos-7-puppet",
-            :url => "https://atlas.hashicorp.com/svarrette/boxes/centos-7-puppet"
-        },
-        :debian_7 => {
-            :box     => "svarrette/debian-7-puppet",
-            :url     => "https://atlas.hashicorp.com/svarrette/debian-7-puppet",
-            :primary => true
-        }
-    }.each do |name,cfg|
-        boxname = name.to_s.downcase.gsub(/_/, '-')
-        config.vm.define boxname, :autostart => (! cfg[:primary].nil?), :primary => cfg[:primary] do |local|
-            #local.vm.primary = true if cfg[:primary]
-            local.vm.box = cfg[:box]
-            local.vm.host_name = ENV['VAGRANT_HOSTNAME'] || name.to_s.downcase.gsub(/_/, '-').concat(".vagrant.com")
-            #config.vm.box_check_update = false
-            local.vm.provision "shell", path: ".vagrant_init.rb"
-            # local.vm.provision :puppet do |puppet|
-            #     puppet.hiera_config_path = 'data/hiera.yaml'
-            #     puppet.working_directory = '/vagrant'
-            #     puppet.manifests_path    = "manifests"
-            #     puppet.module_path       = "modules"
-            #     puppet.manifest_file     = "init.pp"
-            #     puppet.options = [
-            #         '--verbose',
-            #         '--report',
-            #         '--show_diff',
-            #         '--pluginsync',
-            #         '--summarize',
-            #         #        '--evaltrace',
-            #         #        '--debug',
-            #         #        '--parser future',
-            #     ]
-            # end
+    defaults = settings[:defaults]
+    network  = settings[:network]
+
+    ### Common configs shared by all VMs ###
+    # Cache plugin -- Supports local cache, so you don't wast bandwitdh
+    # vagrant plugin install vagrant-cachier   # see https://github.com/fgrehm/vagrant-cachier
+    config.cache.auto_detect = true if Vagrant.has_plugin?("vagrant-cachier")
+
+    # check if VirtualBox Guest Additions are up to date
+    if Vagrant.has_plugin?("vagrant-vbguest")
+        # set auto_update to false, if you do NOT want to check the correct
+        # additions version when booting these boxes
+        config.vbguest.auto_update = defaults[:vbguest_auto_update]
+    end
+
+    # Shell provisioner, to setup minimal conditions for Puppet provisioning
+    DEFAULT_PROVISIONING_SCRIPTS.each do |script|
+        config.vm.provision "shell", path: "#{script}", keep_color: true
+    end
+    config.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+
+    # network settings
+    ipaddr   = IPAddr.new network[:range]
+    ip_range = ipaddr.to_range.to_a
+
+    # cosmetics for the post-up message
+    __table = {
+        :title    => "Puppet Testing infrastructure deployed on Vagrant",
+        :headings => [ 'Name', 'Hostname', 'OS', 'vCPU/RAM', 'Description', 'IP' ],
+        :rows => [],
+    }
+    #__________________________________
+    settings[:vms].each do |name, node|
+        boxname  =  defaults[:os].to_s.downcase.gsub(/([^\d]+)(\d+)/, '\\1-\\2')
+        name     = boxname if name == 'default'
+        hostname = node[:hostname] ? node[:hostname] : name
+        domain   = network[:domain]
+        fqdn     =    "#{hostname}.#{domain}"
+        os       =    node[:os]       ? node[:os].to_sym : defaults[:os].to_sym
+        ram      =    node[:ram]      ? node[:ram]       : defaults[:ram]
+        vcpus    =    node[:vcpus]    ? node[:vcpus]     : defaults[:vcpus]
+        desc     =    node[:desc]     ? node[:desc]      : 'n/a'
+
+        abort "Non-existing box OS '#{os}' for the VM '#{name}'" if  settings[:boxes][os.to_sym].nil?
+        abort "Empty IP address range" if ip_range.empty?
+        ip = ip_range[ network[:ip_offset].to_i ].to_s
+
+        config.vm.define "#{name}" do |c|
+            c.vm.box      = settings[:boxes][os.to_sym]
+            c.vm.hostname = "#{fqdn}"
+            c.vm.network :private_network, :ip => ip
+            c.vm.provision :hosts, :sync_hosts => true
+            c.vm.provider "virtualbox" do |v|
+                v.customize [ 'modifyvm', :id, '--name', hostname, '--memory', ram.to_s ]
+                v.customize [ 'modifyvm', :id, '--cpus', vcpus.to_s ] if vcpus.to_i > 1
+            end
+            __table[:rows] << [ name, fqdn, os.to_sym, "#{vcpus}/#{ram}", desc, ip]
         end
     end
-end
 
+    config.trigger.after :up do
+        puts Terminal::Table.new __table
+    end
+end

data/templates/puppet/modules/docs/vagrant.md.erb

@@ -9,7 +9,14 @@ to build configurable, lightweight, and portable virtual machines dynamically.
 * [Reference installation notes](http://docs.vagrantup.com/v2/installation/) -- assuming you have installed [Oracle's VirtualBox](http://www.virtualbox.org/)
 * [installation notes on Mac OS](http://sourabhbajaj.com/mac-setup/Vagrant/README.html) using [Homebrew](http://brew.sh/) and [Cask](http://sourabhbajaj.com/mac-setup/Homebrew/Cask.html)
 
-The `Vagrantfile` at the root of the repository pilot the provisioning of many vagrant boxes generated through the [vagrant-vms](https://github.com/falkor/vagrant-vms) repository and available on [Vagrant cloud](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=virtualbox&q=svarrette).
+The `Vagrantfile` at the root of the repository pilot the provisioning a vagrant boxes.
+It can run any OS you set in `tests/vagrant/config.yaml` as follows:
+
+```yaml
+:vms:
+  'default':
+    :os: :debian8
+```
 
 You can list the available vagrant box as follows:
 
@@ -17,23 +24,34 @@ You can list the available vagrant box as follows:
 $> vagrant status
 Current machine states:
 
-     centos-7                  not created (virtualbox)
-	   debian-7                  not created (virtualbox)
+centos-7                  running (virtualbox)
 
-       This environment represents multiple VMs. The VMs are all listed
-	   above with their current state. For more information about a specific
-	   VM, run `vagrant status NAME`.
+The VM is running. To stop this VM, you can run `vagrant halt` to
+shut it down forcefully, or you can run `vagrant suspend` to simply
+suspend the virtual machine. In either case, to restart it again,
+simply run `vagrant up`.
 ```
 
-As suggested, you can run a debian 7 machine for instance by issuing:
+You can boot the VM and provision it (using the scripts under `tests/vagrant/`) by running:
 
-      $> vagrant up debian-7
+```bash
+$> vagrant up
+```
 
 Then you can ssh into the machine afterwards:
 
-      $> vagrant ssh debian-7
+```bash
+$> vagrant ssh
+```
+
+When you run `vagrant up <name>` to boot the VM, the provisioning scripts are responsible for:
+
+| Script                    | Description                                     |
+|---------------------------|-------------------------------------------------|
+| `bootstrap.sh`            | Install puppet 4 and defaults packages and gems |
+| `puppet_modules_setup.rb` | pre-install the necessary puppet modules        |
 
-When you run `vagrant up <os>` to boot the VM, it is configured to be provisioned with the `.vagrant_init.rb` script.
+More precisely, the `tests/vagrant/puppet_modules_setup.rb` script.
 This script is responsible for two main tasks:
 
 1. pre-install the puppet modules listed as dependencies in `metadata.json`
@@ -41,7 +59,7 @@ This script is responsible for two main tasks:
 
 So you can test the manifests of the `tests/` directory within the VM:
 
-      $> vagrant ssh <os>
+      $> vagrant ssh [<os>]
       [...]
       (vagrant)$> sudo puppet apply -t /vagrant/tests/init.pp
 

data/templates/puppet/modules/manifests/common/debian.pp.erb

@@ -1,3 +1,6 @@
+################################################################################
+# Time-stamp: <Wed 2017-08-23 14:42 svarrette>
+#
 # File::      <tt>common/debian.pp</tt>
 # Author::    <%= config[:author] %> (<%= config[:mail] %>)
 # Copyright:: Copyright (c) <%= Time.now.year %> <%= config[:author] %>

data/templates/puppet/modules/manifests/common/redhat.pp.erb

@@ -1,3 +1,6 @@
+################################################################################
+# Time-stamp: <Wed 2017-08-23 14:43 svarrette>
+#
 # File::      <tt>common/redhat.pp</tt>
 # Author::    <%= config[:author] %> (<%= config[:mail] %>)
 # Copyright:: Copyright (c) <%= Time.now.year %> <%= config[:author] %>