Skip to content

Commit

Permalink
Merge pull request #2931 from jeff1evesque/feature-2925
Browse files Browse the repository at this point in the history
#2925: Remove and reduce puppet docstring
  • Loading branch information
jeff1evesque committed Mar 6, 2017
2 parents 47fd5cb + 0c283fb commit ac1053b
Show file tree
Hide file tree
Showing 90 changed files with 160 additions and 279 deletions.
5 changes: 1 addition & 4 deletions puppet/environment/docker/manifests/compile_asset.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
###
### compile_asset.pp: install, configure, and run initial compile against
### source files.
###
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
###

## ensure log directory, package dependencies
class dependencies {
Expand Down
5 changes: 1 addition & 4 deletions puppet/environment/docker/manifests/configure_redis.pp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
### configure_redis.pp: install redis client, and redis server.
###
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### configure_redis.pp: install redis client, and redis server.
###

## install redis-server
Expand Down
5 changes: 1 addition & 4 deletions puppet/environment/docker/manifests/configure_system.pp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
### configure_system.pp: configure system with general requirements.
###
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### configure_system.pp: configure system with general requirements.
###

## ensure log directory
Expand Down
9 changes: 3 additions & 6 deletions puppet/environment/docker/manifests/install_packages.pp
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
### install_packages.pp: install general packages.
###
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### install_packages.pp: install general packages.
###

## nodejs, with npm: this cannot be wrapped into a module, and included, as
# needed. Puppet will only allow one instance of this class, regardless of
# of its implementation.
## needed. Puppet will only allow one instance of this class, regardless of
## of its implementation.
class install_nodejs {
## set dependency
require apt
Expand Down
5 changes: 1 addition & 4 deletions puppet/environment/docker/manifests/install_sklearn.pp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
### install_sklearn.pp: install sklearn, with all necessary dependencies.
###
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### install_sklearn.pp: install sklearn, with all necessary dependencies.
###

## create '/vagrant/build/' directory
Expand Down
5 changes: 1 addition & 4 deletions puppet/environment/docker/manifests/setup_database.pp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
### setup_database.pp: install client, and initialize database tables.
###
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### setup_database.pp: install client, and initialize database tables.
###

## install sql
Expand Down
5 changes: 1 addition & 4 deletions puppet/environment/docker/manifests/start_webserver.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
###
### start_webserver.pp: start webserver, and ensure all client services exist,
### and properly configured.
###
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
###

## install mariadb
include database::client
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'compiler::::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### initial_compile.pp, manually compile javascript.
###
class compiler::initial_compile {
## local variables
Expand All @@ -16,7 +15,7 @@
]

## manually compile jsx asset, since first pass through via
# 'start_uglifyjs.pp' does not have adequate scope resolution.
## 'start_uglifyjs.pp' does not have adequate scope resolution.
exec { 'rerun-uglifyjs':
command => "./uglifyjs ${root_dir}",
cwd => "${dev_env_path}/modules/compiler/scripts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
### Note: the prefix 'compiler::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### start_browserify.pp, compile jsx into javascript.
###
class compiler::start_browserify {
# variables
## variables
$hiera_general = lookup('general')
$root_dir = $hiera_general['root']
$environment = $hiera_general['environment']
$dev_env_path = "${root_dir}/puppet/environment/${environment}"

# manually compile
## manually compile
exec { 'browserify':
command => "./browserify ${root_dir}",
cwd => "${dev_env_path}/modules/compiler/scripts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
### Note: the prefix 'compiler::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### start_imagemin.pp, minify images, when possible.
###
class compiler::start_imagemin {
# variables
## variables
$hiera_general = lookup('general')
$root_dir = $hiera_general['root']
$environment = $hiera_general['environment']
$dev_env_path = "${root_dir}/puppet/environment/${environment}"

# manually compile
## manually compile
exec { 'imagemin':
command => "./imagemin ${root_dir}",
cwd => "${dev_env_path}/modules/compiler/scripts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
### Note: the prefix 'compiler::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### start_sass.pp, minify scss into css.
###
class compiler::start_sass {
# variables
## variables
$hiera_general = lookup('general')
$root_dir = $hiera_general['root']
$environment = $hiera_general['environment']
$dev_env_path = "${root_dir}/puppet/environment/${environment}"

# manually compile: increase default timeout (300s)
## manually compile: increase default timeout (300s)
exec { 'sass':
command => "./sass ${root_dir}",
cwd => "${dev_env_path}/modules/compiler/scripts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
### Note: the prefix 'compiler::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### start_uglifyjs.pp, minify javascript.
###
class compiler::start_uglifyjs {
# variables
## variables
$hiera_general = lookup('general')
$root_dir = $hiera_general['root']
$environment = $hiera_general['environment']
$dev_env_path = "${root_dir}/puppet/environment/${environment}"

# manually compile
## manually compile
exec { 'uglifyjs':
command => "./uglifyjs ${root_dir}",
cwd => "${dev_env_path}/modules/compiler/scripts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'compiler::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### webcompilers.pp, create webcompiler services.
###
class compiler::webcompilers {
## variables
Expand Down Expand Up @@ -31,14 +30,14 @@
## define compilers
$compilers.each |String $compiler| {
## dos2unix upstart: convert clrf (windows to linux) in case host
# machine is windows.
## machine is windows.
file { "/etc/init/${compiler}.conf":
ensure => file,
content => dos2unix(template($template_path)),
}

## dos2unix upstart: convert clrf (windows to linux) in case host
# machine is windows.
## machine is windows.
file { "${compiler_dir}/${compiler}":
ensure => file,
content => dos2unix(template("${compiler_dir}/${compiler}")),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'database::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### bindings.pp, ensure mariadb bindings.
###
class database::bindings {
class { '::mysql::bindings':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
### Note: the prefix 'database::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### client.pp, mysql::client: install, and configure mariadb-client.
###
class database::client {
## mysql::client: install, and configure mariadb-client
class { '::mysql::client':
package_name => 'mariadb-client',
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'database::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### database.pp, create mariadb database structure.
###
class database::database {
## variables
Expand All @@ -13,9 +12,9 @@
$script_dir = "${environment_dir}/modules/${module}/scripts"

## define database tables
#
# @require, syntax involves 'Class Containment'. For more information,
# https://puppetlabs.com/blog/class-containment-puppet
##
## @require, syntax involves 'Class Containment'. For more information,
## https://puppetlabs.com/blog/class-containment-puppet
exec { 'create-database-tables':
command => "python setup_tables.py ${root_dir} ${vagrant_mounted}",
cwd => $script_dir,
Expand Down
12 changes: 6 additions & 6 deletions puppet/environment/docker/modules/database/manifests/server.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'database::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### server.pp, create mariadb database, with user permissions.
###
class database::server {
## local variables
Expand All @@ -17,10 +16,11 @@
$bind_address = $hiera_database['bind_address']

## mysql::server: install, and configure mariadb-server
#
# @password_hash, default password (can be adjusted via cli)
# @max_connections_per_hour, @max_queries_per_hour, @max_updates_per_hour,
# @max_user_connections, a zero value indicates no limit
##
## @password_hash, default password (can be adjusted via cli)
## @max_connections_per_hour, @max_queries_per_hour, @max_updates_per_hour,
## @max_user_connections, a zero value indicates no limit
##
class { '::mysql::server':
package_name => 'mariadb-server',
root_password => $root_pass,
Expand Down
3 changes: 1 addition & 2 deletions puppet/environment/docker/modules/package/manifests/fetch.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### fetch.pp, install package.
###
class package::fetch {
## local variables
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### flask_script.pp, install package.
###
class package::flask_script {
require python
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### gunicorn.pp, install package.
###
class package::gunicorn {
require python
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### inotify_tools.pp, install package.
###
class package::inotify_tools {
## update apt-get
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### jsonschema.pp, install package.
###
class package::jsonschema {
include python
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### @libssl_dev.pp, install package.
###
class package::libssl_dev {
## update apt-get
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### pytest_flask.pp, install package.
###
class package::pytest_flask {
require python
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### python_dev.pp, install package.
###
class package::python_dev {
## update apt-get
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### pyyaml.pp, install package.
###
class package::pyyaml {
require python
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### react_presets.pp, install necessary webpackages defined in 'package.json'.
###
class package::react_presets {
## local variables
$hiera_general = lookup('general')
$root_dir = $hiera_general['root']

## install babelify presets for reactjs (npm)
exec { 'install-babelify-presets':
exec { 'install-web-packages':
command => 'npm install --no-bin-links',
cwd => "${root_dir}/src/jsx/",
path => '/usr/bin',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### redis_client.pp, install package.
###
class package::redis_client {
require python
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### redis_server.pp, install package.
###
class package::redis_server {
## local variables
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### scrypt.pp, install package.
###
class package::scrypt {
require python
Expand Down
3 changes: 1 addition & 2 deletions puppet/environment/docker/modules/package/manifests/six.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### six.pp, install package.
###
class package::six {
require python
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### sklearn.pp, clone github codebase.
###
class package::sklearn {
require git
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Note: the prefix 'package::', corresponds to a puppet convention:
###
### https://github.com/jeff1evesque/machine-learning/issues/2349
### sklearn_dependencies.pp, install sklearn related packages.
###
class package::sklearn_dependencies {
## local variables
Expand Down
Loading

0 comments on commit ac1053b

Please sign in to comment.