#2932: Consolidate puppet manifests into 'site.pp'

.travis.yml

@@ -1,29 +1,25 @@
-sudo: required
-
 language: python
-
-## allows 'docker' command
-services:
-  - docker
+dist: trusty
+sudo: required
 
 ## environment variables
 env:
   global:
-    - DOCKER_VERSION=1.12.3-0~trusty
+    - DOCKER_VERSION=17.03.0~ce-0~ubuntu-trusty
 
 ## build docker, install puppet (i.e. puppet parser validate)
+##
+## Note: we install docker per dockers official documentation:
+##
+##       https://docs.docker.com/engine/installation/linux/ubuntu/
+##
 before_install:
-  # docker version before update
-  - docker version
-
-  # list docker-engine versions
-  #- apt-cache madison docker-engine
-
-  # upgrade docker-engine to specific version
-  - sudo apt-get -o Dpkg::Options::="--force-confnew" install -y docker-engine=${DOCKER_VERSION}
-
-  # docker version after update
-  - docker version
+  # install docker to specific version
+  - sudo apt-get install apt-transport-https ca-certificates curl software-properties-common
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get install docker-ce=${DOCKER_VERSION}
 
   # install puppet
   - wget https://apt.puppetlabs.com/puppetlabs-release-pc1-trusty.deb

Vagrantfile

@@ -1,14 +1,14 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
+## -*- mode: ruby -*-
+## vi: set ft=ruby :
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
+## All Vagrant configuration is done below. The "2" in Vagrant.configure
+## configures the configuration version (we support older styles for
 # backwards compatibility). Please don't change it unless you know what
-# you're doing.
+## you're doing.
 Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
+  ## The most common configuration options are documented and commented below.
+  ## For a complete reference, please see the online documentation at
+  ## https://docs.vagrantup.com.
 
   ## Variables (ruby syntax)
   atlas_repo       = 'jeff1evesque'
@@ -39,7 +39,7 @@ Vagrant.configure(2) do |config|
   end
 
   ## Every Vagrant development environment requires a box. You can search for
-  #  boxes at https://atlas.hashicorp.com/search.
+  ## boxes at https://atlas.hashicorp.com/search.
   config.vm.box                        = "#{atlas_repo}/#{atlas_box}"
   config.vm.box_download_checksum      = 'c26da6ba1c169bdc6e9168125ddb0525'
   config.vm.box_url                    = "https://atlas.hashicorp.com/#{atlas_repo}/boxes/#{atlas_box}/versions/#{box_version}/providers/virtualbox.box"
@@ -49,8 +49,8 @@ Vagrant.configure(2) do |config|
   config.puppet_install.puppet_version = '4.9.3'
 
   ## Create a forwarded port mapping which allows access to a specific port
-  #  within the machine from a port on the host machine. In the example below,
-  #  accessing "localhost:8080" will access port 80 on the guest machine.
+  ## within the machine from a port on the host machine. In the example below,
+  ## accessing "localhost:8080" will access port 80 on the guest machine.
   config.vm.network 'forwarded_port', guest: 5000, host: 8080
   config.vm.network 'forwarded_port', guest: 443, host: 8585
 
@@ -64,8 +64,9 @@ Vagrant.configure(2) do |config|
   config.r10k.puppetfile_path = "puppet/environment/#{environment}/Puppetfile"
 
   ## Custom Manifest: install needed packages
-  #
-  #  Note: future parser allow array iteration in the puppet manifest
+  ##
+  ## Note: future parser allow array iteration in the puppet manifest
+  ##
   config.vm.provision 'puppet' do |puppet|
     puppet.environment_path  = 'puppet/environment'
     puppet.environment       = environment
@@ -74,110 +75,11 @@ Vagrant.configure(2) do |config|
       "puppet/environment/#{environment}/modules_contrib",
       "puppet/environment/#{environment}/modules",
     ]
-    puppet.manifest_file     = 'install_packages.pp'
+    puppet.manifest_file     = 'site.pp'
     puppet.hiera_config_path = 'hiera.yaml'
   end
 
-  ## Custom Manifest: build scikit-learn
-  config.vm.provision 'puppet' do |puppet|
-    puppet.environment_path  = 'puppet/environment'
-    puppet.environment       = environment
-    puppet.manifests_path    = "puppet/environment/#{environment}/manifests"
-    puppet.module_path       = [
-      "puppet/environment/#{environment}/modules_contrib",
-      "puppet/environment/#{environment}/modules",
-    ]
-    puppet.manifest_file     = 'install_sklearn.pp'
-    puppet.hiera_config_path = 'hiera.yaml'
-  end
-
-  ## Custom Manifest: ensure vagrant-mounted event
-  #
-  #  Note: future parser allow heredoc syntax in the puppet manifest (since puppet 3.5)
-  config.vm.provision 'puppet' do |puppet|
-    puppet.environment_path  = 'puppet/environment'
-    puppet.environment       = environment
-    puppet.manifests_path    = "puppet/environment/#{environment}/manifests"
-    puppet.module_path       = [
-      "puppet/environment/#{environment}/modules_contrib",
-      "puppet/environment/#{environment}/modules",
-    ]
-    puppet.manifest_file     = 'vagrant_mounted.pp'
-    puppet.hiera_config_path = 'hiera.yaml'
-  end
-
-  ## Custom Manifest: install redis client / server
-  #
-  #  Note: future parser allow heredoc syntax in the puppet manifest (since puppet 3.5)
-  config.vm.provision 'puppet' do |puppet|
-    puppet.environment_path = 'puppet/environment'
-    puppet.environment      = environment
-    puppet.manifests_path   = "puppet/environment/#{environment}/manifests"
-    puppet.module_path      = [
-      "puppet/environment/#{environment}/modules_contrib",
-      "puppet/environment/#{environment}/modules",
-    ]
-    puppet.manifest_file    = 'configure_redis.pp'
-    puppet.hiera_config_path = 'hiera.yaml'
-  end
-
-  ## Custom Manifest: configure system (i.e. system timezone)
-  config.vm.provision 'puppet' do |puppet|
-    puppet.environment_path = 'puppet/environment'
-    puppet.environment      = environment
-    puppet.manifests_path   = "puppet/environment/#{environment}/manifests"
-    puppet.module_path      = [
-      "puppet/environment/#{environment}/modules_contrib",
-      "puppet/environment/#{environment}/modules",
-    ]
-    puppet.manifest_file    = 'configure_system.pp'
-  end
-
-  ## Custom Manifest: define webcompilers
-  #
-  #  Note: future parser allow heredoc sytnax (since puppet 3.5), and allows
-  #        array iteration in the puppet manifest.
-  config.vm.provision 'puppet' do |puppet|
-    puppet.environment_path  = 'puppet/environment'
-    puppet.environment       = environment
-    puppet.manifests_path    = "puppet/environment/#{environment}/manifests"
-    puppet.module_path       = [
-      "puppet/environment/#{environment}/modules_contrib",
-      "puppet/environment/#{environment}/modules",
-    ]
-    puppet.manifest_file     = 'compile_asset.pp'
-    puppet.hiera_config_path = 'hiera.yaml'
-  end
-
-  ## Custom Manifest: install, and configure SQL database
-  config.vm.provision 'puppet' do |puppet|
-    puppet.environment_path  = 'puppet/environment'
-    puppet.environment       = environment
-    puppet.manifests_path    = "puppet/environment/#{environment}/manifests"
-    puppet.module_path       = [
-      "puppet/environment/#{environment}/modules_contrib",
-      "puppet/environment/#{environment}/modules",
-    ]
-    puppet.manifest_file     = 'setup_database.pp'
-    puppet.hiera_config_path = 'hiera.yaml'
-  end
-
-  ## Custom Manifest: start webserver
-  #
-  #  Note: future parser allow heredoc syntax in the puppet manifest (since puppet 3.5)
-  config.vm.provision 'puppet' do |puppet|
-    puppet.environment_path  = 'puppet/environment'
-    puppet.environment       = environment
-    puppet.manifests_path    = "puppet/environment/#{environment}/manifests"
-    puppet.module_path       = [
-      "puppet/environment/#{environment}/modules_contrib",
-      "puppet/environment/#{environment}/modules",
-    ]
-    puppet.manifest_file     = 'start_webserver.pp'
-    puppet.hiera_config_path = 'hiera.yaml'
-  end
-
-  # clean up files on the host after 'vagrant destroy'
+  ## clean up files on the host after 'vagrant destroy'
   config.trigger.after :destroy do
     run 'rm -Rf log/database'
     run 'rm -Rf log/application'

database.dockerfile

@@ -6,7 +6,7 @@ ENV ENVIRONMENT docker
 ENV ENVIRONMENT_DIR $ROOT_PROJECT/puppet/environment/$ENVIRONMENT
 
 ## provision with puppet
-RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/manifests/setup_database.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
+RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/modules/database/manifests/init.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
 
 ## executed everytime container starts
-CMD ["mysqld"]
+CMD ["/bin/sh", "-c", "mysqld"]

default.dockerfile

@@ -10,8 +10,9 @@ RUN mkdir /var/machine-learning
 COPY . /var/machine-learning
 
 ## install git, wget, pip
-#
-#  Note: r10k requires 'git' installed
+##
+##  Note: r10k requires 'git' installed
+##
 RUN apt-get -y update
 RUN apt-get -y install git=1:1.9.1-1ubuntu0.3
 RUN apt-get -y install wget=1.15-1ubuntu1.14.04.2
@@ -25,7 +26,7 @@ RUN apt-get -y install puppet-agent
 
 ## install r10k
 RUN apt-get -y install rubygems-integration=1.5
-RUN gem install r10k -v 2.2.0
+RUN gem install r10k -v 2.5.2
 
 ## install pytest-cov
 RUN pip install pytest-cov==2.4.0
@@ -35,12 +36,7 @@ RUN mkdir -p $ENVIRONMENT_DIR/modules_contrib/
 RUN PUPPETFILE=$ENVIRONMENT_DIR/Puppetfile PUPPETFILE_DIR=$ENVIRONMENT_DIR/modules_contrib/ r10k puppetfile install
 
 ## provision with puppet
-RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/manifests/install_packages.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
-RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/manifests/install_sklearn.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
-RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/manifests/configure_system.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
-RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/manifests/compile_asset.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test --debug
-
-## show directory
-RUN ls -l $ROOT_PROJECT/interface/static/js
-RUN ls -l $ROOT_PROJECT/interface/static/css
-RUN ls -l $ROOT_PROJECT/interface/static/img
+RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/modules/package/manifests/init.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
+RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/modules/sklearn/manifests/init.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
+RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/modules/system/manifests/init.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test
+RUN /opt/puppetlabs/bin/puppet apply $ENVIRONMENT_DIR/modules/compiler/manifests/init.pp --modulepath=$ENVIRONMENT_DIR/modules_contrib:$ENVIRONMENT_DIR/modules --confdir=$ROOT_PROJECT/hiera/test --debug

hiera/test/hiera.yaml

@@ -1,10 +1,12 @@
 ---
-:backends:
-  - yaml
+version: 5
+defaults:
+  datadir: /var/machine-learning/hiera
+  data_hash: yaml_data
 
-:yaml:
-  :datadir: /var/machine-learning/hiera
+hierarchy:
+  - name: 'General build packages'
+    path: packages.yaml
 
-:hierarchy:
-  - packages
-  - test/hiera/settings
+  - name: 'General application settings'
+    path: test/hiera/settings.yaml

puppet/environment/docker/Puppetfile

@@ -5,7 +5,7 @@
 ## Install Module: stdlib (apt dependency)
 mod 'stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git',
-  :ref => '4.11.0'
+  :ref => '4.15.0'
 
 ## Install Module: apt (from master)
 mod 'apt',
@@ -14,8 +14,8 @@ mod 'apt',
 
 ## Install Module: nodejs
 mod 'nodejs',
-  :git => 'https://github.com/puppet-community/puppet-nodejs.git',
-  :ref => 'v1.3.0'
+  :git => 'https://github.com/voxpupuli/puppet-nodejs.git',
+  :ref => 'v2.3.0'
 
 ## Install Module: git
 mod 'git',