Merge pull request #7 from herqles-io/arrayfix

Puppet4 is much stricter about arrays and strings, make all strings
herqles-io · Jan 14, 2016 · c0909af · c0909af
2 parents 0ce6120 + 09d01d2
commit c0909af
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/manifests/cli/plugin.pp b/manifests/cli/plugin.pp
@@ -3,7 +3,7 @@
   $module,
   $repo=None,
   $version='present',
-  $install_args=[],
+  $install_args,
   $base_config={}
 ) {
 
@@ -15,14 +15,13 @@
   $user = $herqles::user
 
   if !defined(Python::Pip[$pkgname]) {
-    $_install_args_string = join($install_args, ' ')
     python::pip { $pkgname:
       ensure       => $version,
       pkgname      => $pkgname,
       url          => $repo,
       virtualenv   => "${install_path}/venv",
       owner        => $user,
-      install_args => $_install_args_string,
+      install_args => $install_args,
     }
   }
 

diff --git a/manifests/component.pp b/manifests/component.pp
@@ -3,7 +3,7 @@
   $config,
   $repo=None,
   $version='present',
-  $install_args=[]
+  $install_args,
 ) {
 
   require ::herqles
@@ -17,7 +17,6 @@
   if $repo != None {
     validate_string($repo)
   }
-  validate_array($install_args)
   validate_hash($config)
 
   python::pip { $pkgname:
@@ -53,11 +52,8 @@
 
   if $manage_service {
     herqles::service { $name:
-      subscribe => [ File["${config_path}/${name}/config.yml"], File['/etc/sysconfig/herqles'] ],
-      require   => [
-        File["${config_path}/${name}/config.yml"],
-        File['/etc/sysconfig/herqles']
-      ]
+      subscribe => File["${config_path}/${name}/config.yml", '/etc/sysconfig/herqles' ],
+      require   => File["${config_path}/${name}/config.yml", '/etc/sysconfig/herqles'],
     }
   }
 

diff --git a/manifests/framework.pp b/manifests/framework.pp
@@ -29,7 +29,7 @@
   herqles::component { 'hq-framework':
     pkgname      => 'hq-framework',
     repo         => 'git+https://github.com/herqles-io/hq-framework.git',
-    install_args => [ '--process-dependency-links' ],
+    install_args => '--process-dependency-links',
     version      => $version,
     config       => $config,
   }

diff --git a/manifests/framework/framework_data.pp b/manifests/framework/framework_data.pp
@@ -3,7 +3,7 @@
   $pkgname,
   $version='present',
   $repo=undef,
-  $install_args=[]
+  $install_args,
 ) {
 
   validate_string($module)
@@ -12,6 +12,5 @@
   if $repo != undef {
     validate_string($repo)
   }
-  validate_array($install_args)
 
 }
diff --git a/manifests/manager.pp b/manifests/manager.pp
@@ -34,7 +34,7 @@
   herqles::component { 'hq-manager':
     pkgname      => 'hq-manager',
     repo         => 'git+https://github.com/herqles-io/hq-manager.git',
-    install_args => [ '--process-dependency-links' ],
+    install_args => '--process-dependency-links',
     version      => $version,
     config       => $config
   }

diff --git a/manifests/worker.pp b/manifests/worker.pp
@@ -25,7 +25,7 @@
   herqles::component { 'hq-worker':
     pkgname      => 'hq-worker',
     repo         => 'git+https://github.com/herqles-io/hq-worker.git',
-    install_args => [ '--process-dependency-links' ],
+    install_args => '--process-dependency-links',
     version      => $version,
     config       => $config
   }

diff --git a/manifests/worker/worker_data.pp b/manifests/worker/worker_data.pp
@@ -3,7 +3,7 @@
   $pkgname,
   $version='present',
   $repo=undef,
-  $install_args=[]
+  $install_args,
 ) {
 
   validate_string($module)
@@ -12,6 +12,5 @@
   if $repo != undef {
     validate_string($repo)
   }
-  validate_array($install_args)
 
 }