Merge pull request puppetlabs#37 from Andrew-Hayes/vmfloaty_updates

Updated vmfloaty module to allow different home dirs
ThoughtCrhyme · Dec 16, 2016 · 00d041d · 00d041d
2 parents 53103c4 + 9cc2b60
commit 00d041d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/tools/laptop_puppetisation/modules/vmfloaty/data/common.yaml b/tools/laptop_puppetisation/modules/vmfloaty/data/common.yaml
@@ -1,5 +1,6 @@
 ---
-vmfloaty::config_file: '/.vmfloaty.yml'
+vmfloaty::config_file: '.vmfloaty.yml'
+vmfloaty::home_dir: '/Users'
 vmfloaty::config_file_mode: '0444'
 vmfloaty::config_template: 'vmfloaty/vmfloaty.yml.epp'
 vmfloaty::package_ensure: 'present'

diff --git a/tools/laptop_puppetisation/modules/vmfloaty/manifests/config.pp b/tools/laptop_puppetisation/modules/vmfloaty/manifests/config.pp
@@ -1,13 +1,13 @@
 class vmfloaty::config inherits vmfloaty {
 
   if $vmpooler_token != undef {
-    $home_dir = "/Users/$mac_current_user/"
-    file { $home_dir:
+    $user_home_dir = "$vmfloaty::home_dir/$mac_current_user/"
+    file { $user_home_dir:
       ensure => directory,
-      before => File["$home_dir$vmfloaty::config_file"],
+      before => File["$user_home_dir$vmfloaty::config_file"],
     }
 
-    file { "$home_dir$vmfloaty::config_file":
+    file { "$user_home_dir$vmfloaty::config_file":
       ensure  => file,
       owner   => 0,
       group   => 0,
@@ -16,5 +16,7 @@
                                                     'user_name'  => $jira_assignee,
                                                     'user_token' => $vmpooler_token}),
     }
+  } else {
+    notify { 'No vmpooler token detected, so cannot configure vmfloaty': }
   }
 }
diff --git a/tools/laptop_puppetisation/modules/vmfloaty/manifests/init.pp b/tools/laptop_puppetisation/modules/vmfloaty/manifests/init.pp
@@ -34,6 +34,7 @@
   String $package_ensure,
   String $package_name,
   String $vmpooler_url,
+  String $home_dir,
 ) {
   contain vmfloaty::install
   contain vmfloaty::config