Merge branch 'release/0.8.5' into production

ULHPC · Jul 31, 2019 · c26e1b2 · c26e1b2
2 parents 7923b52 + 605e7ae
commit c26e1b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -76,6 +76,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   facter (>= 1.7.0)
@@ -86,4 +87,4 @@ DEPENDENCIES
   rspec-puppet
 
 BUNDLED WITH
-   1.14.6
+   1.16.5
diff --git a/manifests/common.pp b/manifests/common.pp
@@ -26,7 +26,7 @@
     # * restrict to the SSH keys having a key matching the users listed in sysadmins::users
     $auth_keys = parseyaml(inline_template('<%= scope.lookupvar("sysadmins::ssh_keys").select { |k,v| scope.lookupvar("sysadmins::users").keys.find{ |e| k =~ /^#{e}/ } }.to_yaml %>'))
     # * specialize the options field for these SSH keys
-    $real_ssh_keys = parseyaml(inline_template('<%= @auth_keys.each{ |k,v| v["options"] = "environment=\"SYSADMIN_USER=#{k.gsub(/@.*/, "")}\" "}.to_yaml %>'))
+    $real_ssh_keys = parseyaml(inline_template('<%= @auth_keys.each{ |k,v| v["options"] = "environment=\"SYSADMIN_USER=#{k.gsub(/@.*/, "")}\""}.to_yaml %>'))
     #notice($real_ssh_keys)
 
     $real_users = {

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "ULHPC/sysadmins",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "author": "UL HPC DevOps Team aka. S. Varrette, H. Cartiaux, V. Plugaru, S. Diehl and C.Parisot",
   "mail": "hpc-sysadmins@uni.lu",
   "summary": "Configuration of a single system administrator account (localadmin by default) attached to (potentially) several  users",