Merge pull request #2927 from jeff1evesque/feature-2926

#2926: Replace puppet 'hiera' with 'lookup'
jeff1evesque · Mar 4, 2017 · 64b7bcf · 64b7bcf
2 parents 0055dec + aa687ee
commit 64b7bcf
Show file tree

Hide file tree

Showing 67 changed files with 75 additions and 75 deletions.
diff --git a/puppet/environment/docker/modules/compiler/manifests/initial_compile.pp b/puppet/environment/docker/modules/compiler/manifests/initial_compile.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::initial_compile {
     ## local variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/docker/modules/compiler/manifests/start_browserify.pp b/puppet/environment/docker/modules/compiler/manifests/start_browserify.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::start_browserify {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/docker/modules/compiler/manifests/start_imagemin.pp b/puppet/environment/docker/modules/compiler/manifests/start_imagemin.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::start_imagemin {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/docker/modules/compiler/manifests/start_sass.pp b/puppet/environment/docker/modules/compiler/manifests/start_sass.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::start_sass {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/docker/modules/compiler/manifests/start_uglifyjs.pp b/puppet/environment/docker/modules/compiler/manifests/start_uglifyjs.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::start_uglifyjs {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/docker/modules/compiler/manifests/webcompilers.pp b/puppet/environment/docker/modules/compiler/manifests/webcompilers.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::webcompilers {
     ## variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $user            = $hiera_general['user']
     $group           = $hiera_general['group']

diff --git a/puppet/environment/docker/modules/database/manifests/database.pp b/puppet/environment/docker/modules/database/manifests/database.pp
@@ -4,7 +4,7 @@
 ###
 class database::database {
     ## variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $vagrant_mounted = $hiera_general['vagrant_implement']
     $environment     = $hiera_general['environment']

diff --git a/puppet/environment/docker/modules/database/manifests/server.pp b/puppet/environment/docker/modules/database/manifests/server.pp
@@ -4,7 +4,7 @@
 ###
 class database::server {
     ## local variables
-    $hiera_database   = hiera('database')
+    $hiera_database   = lookup('database')
     $db_host          = $hiera_database['allow_host']
     $db               = $hiera_database['name']
     $db_user          = $hiera_database['username']

diff --git a/puppet/environment/docker/modules/package/manifests/fetch.pp b/puppet/environment/docker/modules/package/manifests/fetch.pp
@@ -4,7 +4,7 @@
 ###
 class package::fetch {
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['npm']['fetch']
 
     ## package: install general packages (npm)

diff --git a/puppet/environment/docker/modules/package/manifests/flask_script.pp b/puppet/environment/docker/modules/package/manifests/flask_script.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['flask-script']
 
     package { 'Flask-Script':

diff --git a/puppet/environment/docker/modules/package/manifests/gunicorn.pp b/puppet/environment/docker/modules/package/manifests/gunicorn.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['gunicorn']
 
     package { 'gunicorn':

diff --git a/puppet/environment/docker/modules/package/manifests/inotify_tools.pp b/puppet/environment/docker/modules/package/manifests/inotify_tools.pp
@@ -7,7 +7,7 @@
     require apt
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['apt']['inotify-tools']
 
     package { "inotify-tools=${version}":

diff --git a/puppet/environment/docker/modules/package/manifests/jsonschema.pp b/puppet/environment/docker/modules/package/manifests/jsonschema.pp
@@ -6,7 +6,7 @@
     include python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['jsonschema']
 
     package { 'jsonschema':

diff --git a/puppet/environment/docker/modules/package/manifests/libssl_dev.pp b/puppet/environment/docker/modules/package/manifests/libssl_dev.pp
@@ -7,7 +7,7 @@
     require apt
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['apt']['libssl-dev']
 
     package { "libssl-dev=${version}":

diff --git a/puppet/environment/docker/modules/package/manifests/pytest_flask.pp b/puppet/environment/docker/modules/package/manifests/pytest_flask.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['pytest-flask']
 
     package { 'pytest-flask':

diff --git a/puppet/environment/docker/modules/package/manifests/python_dev.pp b/puppet/environment/docker/modules/package/manifests/python_dev.pp
@@ -7,7 +7,7 @@
     require apt
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['apt']['python-dev']
 
     package { "python-dev=${version}":

diff --git a/puppet/environment/docker/modules/package/manifests/pyyaml.pp b/puppet/environment/docker/modules/package/manifests/pyyaml.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['pyyaml']
 
     package { 'pyyaml':

diff --git a/puppet/environment/docker/modules/package/manifests/react_presets.pp b/puppet/environment/docker/modules/package/manifests/react_presets.pp
@@ -4,7 +4,7 @@
 ###
 class package::react_presets {
     ## local variables
-    $hiera_general = hiera('general')
+    $hiera_general = lookup('general')
     $root_dir      = $hiera_general['root']
 
     ## install babelify presets for reactjs (npm)

diff --git a/puppet/environment/docker/modules/package/manifests/redis_client.pp b/puppet/environment/docker/modules/package/manifests/redis_client.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['redis']
 
     package { 'redis':

diff --git a/puppet/environment/docker/modules/package/manifests/redis_server.pp b/puppet/environment/docker/modules/package/manifests/redis_server.pp
@@ -4,7 +4,7 @@
 ###
 class package::redis_server {
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['apt']['redis-server']
 
     package { 'redis-server':

diff --git a/puppet/environment/docker/modules/package/manifests/scrypt.pp b/puppet/environment/docker/modules/package/manifests/scrypt.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['scrypt']
 
     package { 'scrypt':

diff --git a/puppet/environment/docker/modules/package/manifests/six.pp b/puppet/environment/docker/modules/package/manifests/six.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['six']
 
     package { 'six':

diff --git a/puppet/environment/docker/modules/package/manifests/sklearn.pp b/puppet/environment/docker/modules/package/manifests/sklearn.pp
@@ -6,10 +6,10 @@
     require git
 
     ## local variables
-    $hiera_general = hiera('general')
+    $hiera_general = lookup('general')
     $root_dir      = $hiera_general['root']
 
-    $hiera_dev     = hiera('development')
+    $hiera_dev     = lookup('development')
     $version       = $hiera_dev['github']['sklearn']
 
     ## download sklearn

diff --git a/puppet/environment/docker/modules/package/manifests/sklearn_dependencies.pp b/puppet/environment/docker/modules/package/manifests/sklearn_dependencies.pp
@@ -4,7 +4,7 @@
 ###
 class package::sklearn_dependencies {
     ## local variables
-    $hiera_dev            = hiera('development')
+    $hiera_dev            = lookup('development')
     $version_python_dev   = $hiera_dev['apt']['python-dev']
     $version_python_numpy = $hiera_dev['apt']['python-numpy']
     $version_python_scipy = $hiera_dev['apt']['python-scipy']

diff --git a/puppet/environment/docker/modules/package/manifests/webcompilers.pp b/puppet/environment/docker/modules/package/manifests/webcompilers.pp
@@ -4,7 +4,7 @@
 ###
 class package::webcompilers {
     ## hiera attributes
-    $hiera_dev          = hiera('development')
+    $hiera_dev          = lookup('development')
     $version_uglify_js  = $hiera_dev['npm']['uglify-js']
     $version_imagemin   = $hiera_dev['npm']['imagemin']
     $version_node_sass  = $hiera_dev['npm']['node-sass']

diff --git a/puppet/environment/docker/modules/package/manifests/xmltodict.pp b/puppet/environment/docker/modules/package/manifests/xmltodict.pp
@@ -6,7 +6,7 @@
     include python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['xmltodict']
 
     package { 'xmltodict':

diff --git a/puppet/environment/docker/modules/redis/manifests/configuration.pp b/puppet/environment/docker/modules/redis/manifests/configuration.pp
@@ -4,7 +4,7 @@
 ###
 class redis::configuration {
     ## variables
-    $hiera_redis   = hiera('redis')
+    $hiera_redis   = lookup('redis')
     $bind_address  = $hiera_redis['bind_address']
     $config_file   = $hiera_redis['path']
     $template_path = 'redis/configuration.erb'

diff --git a/puppet/environment/docker/modules/sklearn/manifests/build_sklearn.pp b/puppet/environment/docker/modules/sklearn/manifests/build_sklearn.pp
@@ -4,7 +4,7 @@
 ###
 class sklearn::build_sklearn {
     ## local variables
-    $hiera_general = hiera('general')
+    $hiera_general = lookup('general')
     $root_dir      = $hiera_general['root']
 
     ## build sklearn

diff --git a/puppet/environment/docker/modules/sklearn/manifests/install_sklearn.pp b/puppet/environment/docker/modules/sklearn/manifests/install_sklearn.pp
@@ -7,7 +7,7 @@
     require python
 
     ## local variables
-    $hiera_general = hiera('general')
+    $hiera_general = lookup('general')
     $root_dir      = $hiera_general['root']
 
     ## install sklearn

diff --git a/puppet/environment/docker/modules/system/manifests/build_directory.pp b/puppet/environment/docker/modules/system/manifests/build_directory.pp
@@ -4,7 +4,7 @@
 ###
 class system::build_directory {
     ## local variables
-    $hiera_general = hiera('general')
+    $hiera_general = lookup('general')
     $root_dir      = $hiera_general['root']
 
     file { "${root_dir}/build/":

diff --git a/puppet/environment/docker/modules/system/manifests/log_directory.pp b/puppet/environment/docker/modules/system/manifests/log_directory.pp
@@ -4,8 +4,8 @@
 ###
 class system::log_directory {
     ## local variables
-    $hiera_general = hiera('general')
-    $root_dir = $hiera_general['root']
+    $hiera_general = lookup('general')
+    $root_dir      = $hiera_general['root']
 
     $directories = [
         "${root_dir}/log/database",

diff --git a/puppet/environment/docker/modules/system/manifests/webcompiler_directory.pp b/puppet/environment/docker/modules/system/manifests/webcompiler_directory.pp
@@ -4,7 +4,7 @@
 ###
 class system::webcompiler_directory {
     ## local variables
-    $hiera_general = hiera('general')
+    $hiera_general = lookup('general')
     $root_dir      = $hiera_general['root']
 
     $directories = {

diff --git a/puppet/environment/docker/modules/webserver/manifests/service.pp b/puppet/environment/docker/modules/webserver/manifests/service.pp
@@ -4,9 +4,9 @@
 ###
 class webserver::service {
     ## variables
-    $hiera_general     = hiera('general')
-    $hiera_development = hiera('development')
-    $hiera_webserver   = hiera('webserver')
+    $hiera_general     = lookup('general')
+    $hiera_development = lookup('development')
+    $hiera_webserver   = lookup('webserver')
     $template_path     = 'webserver/gunicorn.erb'
 
     $vagrant_mounted = $hiera_general['vagrant_implement']

diff --git a/puppet/environment/docker/modules/webserver/manifests/start.pp b/puppet/environment/docker/modules/webserver/manifests/start.pp
@@ -4,7 +4,7 @@
 ###
 class webserver::start {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $vagrant_mounted = $hiera_general['vagrant_implement']
 
     # run gunicorn

diff --git a/puppet/environment/vagrant/modules/compiler/manifests/initial_compile.pp b/puppet/environment/vagrant/modules/compiler/manifests/initial_compile.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::initial_compile {
     ## local variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/vagrant/modules/compiler/manifests/start_browserify.pp b/puppet/environment/vagrant/modules/compiler/manifests/start_browserify.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::start_browserify {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/vagrant/modules/compiler/manifests/start_imagemin.pp b/puppet/environment/vagrant/modules/compiler/manifests/start_imagemin.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::start_imagemin {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/vagrant/modules/compiler/manifests/start_uglifyjs.pp b/puppet/environment/vagrant/modules/compiler/manifests/start_uglifyjs.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::start_uglifyjs {
     # variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $environment     = $hiera_general['environment']
     $dev_env_path    = "${root_dir}/puppet/environment/${environment}"

diff --git a/puppet/environment/vagrant/modules/compiler/manifests/webcompilers.pp b/puppet/environment/vagrant/modules/compiler/manifests/webcompilers.pp
@@ -4,7 +4,7 @@
 ###
 class compiler::webcompilers {
     ## variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $user            = $hiera_general['user']
     $group           = $hiera_general['group']

diff --git a/puppet/environment/vagrant/modules/database/manifests/database.pp b/puppet/environment/vagrant/modules/database/manifests/database.pp
@@ -4,7 +4,7 @@
 ###
 class database::database {
     ## variables
-    $hiera_general   = hiera('general')
+    $hiera_general   = lookup('general')
     $root_dir        = $hiera_general['root']
     $vagrant_mounted = $hiera_general['vagrant_implement']
     $environment     = $hiera_general['environment']

diff --git a/puppet/environment/vagrant/modules/database/manifests/server.pp b/puppet/environment/vagrant/modules/database/manifests/server.pp
@@ -4,8 +4,8 @@
 ###
 class database::server {
     ## local variables
-    $hiera_general    = hiera('general')
-    $hiera_database   = hiera('database')
+    $hiera_general    = lookup('general')
+    $hiera_database   = lookup('database')
     $host             = $hiera_general['host']
     $db               = $hiera_database['name']
     $db_user          = $hiera_database['username']

diff --git a/puppet/environment/vagrant/modules/package/manifests/fetch.pp b/puppet/environment/vagrant/modules/package/manifests/fetch.pp
@@ -4,7 +4,7 @@
 ###
 class package::fetch {
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['npm']['fetch']
 
     ## package: install general packages (npm)

diff --git a/puppet/environment/vagrant/modules/package/manifests/flask_script.pp b/puppet/environment/vagrant/modules/package/manifests/flask_script.pp
@@ -6,7 +6,7 @@
     require python
 
     ## local variables
-    $hiera_dev = hiera('development')
+    $hiera_dev = lookup('development')
     $version   = $hiera_dev['pip']['flask-script']
 
     package { 'Flask-Script':