#2935: use hiera, or module args for nginx 'upstream'

jeff1evesque · Apr 29, 2018 · 4d22095 · 4d22095
1 parent d296c76
commit 4d22095
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/puppet/environment/docker/modules/reverse_proxy/manifests/config.pp b/puppet/environment/docker/modules/reverse_proxy/manifests/config.pp
@@ -3,6 +3,7 @@
 ###
 class reverse_proxy::config {
     ## local variables
+    $yaml               = $::reverse_proxy::yaml
     $type               = $::reverse_proxy::type
     $self_signed        = $::reverse_proxy::self_signed
     $vhost              = $::reverse_proxy::vhost
@@ -21,9 +22,22 @@
     $access_log         = $::reverse_proxy::access_log
     $error_log          = $::reverse_proxy::error_log
 
+    ## hiera already array
+    if $yaml and $members {
+        $split_members  = $members
+    }
+
+    ## convert module argument to array
+    elsif $members {
+        $split_members  = split($members, ',')
+    }
+
     ## reverse proxy members
-    nginx::resource::upstream { "${proxy}-${type}":
-        members         => split($members, ','),
+    if $split_members {
+        nginx::resource::upstream { "${proxy}-${type}":
+            ensure      => present,
+            members     => $split_members,
+        }
     }
 
     ## https only server: since 'listen_port' = 'ssl_port'

diff --git a/puppet/environment/docker/modules/reverse_proxy/manifests/init.pp b/puppet/environment/docker/modules/reverse_proxy/manifests/init.pp
@@ -6,6 +6,7 @@
 ###     - https://github.com/voxpupuli/puppet-nginx
 ###
 class reverse_proxy (
+    $yaml           = $::reverse_proxy::params::yaml,
     $run            = $::reverse_proxy::params::run,
     $type           = $::reverse_proxy::params::type,
     $vhost          = $::reverse_proxy::params::vhost,

diff --git a/puppet/environment/docker/modules/reverse_proxy/manifests/params.pp b/puppet/environment/docker/modules/reverse_proxy/manifests/params.pp
@@ -9,6 +9,7 @@
     $version            = 'latest'
 
     if $hiera {
+        $yaml           = true
         $type           = $hiera['type']
         $vhost          = $hiera['vhost']
         $host_port      = $hiera['host_port']
@@ -30,6 +31,7 @@
     }
 
     else {
+        $yaml           = false
         $type           = ''
         $vhost          = ''
         $host_port      = ''