Merge pull request #459 from monkey670/improvement/windows_paths

Change allow for spaces in the path, Add extra_options to the win agent
voxpupuli · Jan 2, 2019 · 09449a4 · 09449a4
2 parents 357f113 + d871549
commit 09449a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/manifests/windows_service.pp b/manifests/windows_service.pp
@@ -17,7 +17,7 @@
   $app_dir = regsubst($consul::bin_dir, '\/', '\\', 'G')
   $app_exec = "${app_dir}\\consul.exe"
   $agent_args = regsubst($consul::config_dir, '\/', '\\', 'G')
-  $app_args = "agent -config-dir=${agent_args}"
+  $app_args = "agent -config-dir='${agent_args}' ${consul::extra_options}"
   $app_log_path = "${app_dir}\\logs"
   $app_log_file = 'consul.log'
   $app_log = "${app_log_path}//${app_log_file}"
@@ -45,7 +45,7 @@
   }
   -> exec { 'consul_service_set_parameters':
     cwd         => $consul::bin_dir,
-    command     => "${consul::bin_dir}/set_service_parameters.ps1",
+    command     => "& '${consul::bin_dir}/set_service_parameters.ps1'",
     refreshonly => true,
     logoutput   => true,
     provider    => 'powershell',