#2932: restructure 'vagrant' puppet environment

Vagrantfile

@@ -74,106 +74,7 @@ Vagrant.configure(2) do |config|
       "puppet/environment/#{environment}/modules_contrib",
       "puppet/environment/#{environment}/modules",
     ]
-    puppet.manifest_file     = 'install_packages.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.manifest_file     = 'site.pp'
     puppet.hiera_config_path = 'hiera.yaml'
   end
 

puppet/environment/vagrant/manifests/site.pp

@@ -0,0 +1,12 @@
+###
+### site.pp: load all necessary modules.
+###
+
+include package
+include sklearn
+include vagrant
+include redis
+include system
+include compiler
+include database
+include webserver

puppet/environment/vagrant/modules/compiler/manifests/init.pp

@@ -0,0 +1,49 @@
+###
+### init.pp: install, configure, and run initial compile against
+###                   source files.
+###
+
+class compiler {
+    ## ensure log directory, package dependencies
+    class dependencies {
+        require system::log_directory
+        contain package::webcompilers
+    }
+
+    ## configure webcompilers
+    class configure {
+        ## set dependency
+        require dependencies
+
+        ## configure webcompilers	
+        require system::webcompiler_directory
+        contain compiler::webcompilers
+    }
+
+    ## start webcompilers
+    class start {
+        ## set dependency
+        require dependencies
+        require configure
+
+        ## start compiler(s)
+        contain compiler::start_sass
+        contain compiler::start_uglifyjs
+        contain compiler::start_browserify
+        contain compiler::start_imagemin
+    }
+
+    ## initial compile
+    class initiate {
+        ## set dependency
+        require dependencies
+        require configure
+        require start
+
+        ## initial compile
+        contain compiler::initial_compile
+    }
+
+    ## initiate
+    include initiate
+}

puppet/environment/vagrant/modules/database/manifests/init.pp

@@ -0,0 +1,26 @@
+###
+### init.pp: install client, and initialize database tables.
+###
+
+class database {
+    ## install sql
+    class install_sql {
+        ## install mariadb
+        contain database::server
+
+        ## install mariadb client
+        contain database::client
+
+        ## install mariad bindings
+        contain database::bindings
+    }
+
+    ## create database tables
+    class create_db {
+        require install_sql
+        contain database::database
+    }
+
+    ## initiate
+    include create_db
+}