Merge pull request #65 from dmitryilyin/master

Add file:// to credentials option
deric · Mar 14, 2016 · c69e493 · c69e493
2 parents 97c8043 + 7c73850
commit c69e493
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/master.pp b/manifests/master.pp
@@ -66,7 +66,7 @@
   }
 
   if (!empty($credentials)) {
-    $credentials_options = {'credentials' => $credentials_file}
+    $credentials_options = {'credentials' => "file://${credentials_file}"}
     $credentials_content = inline_template("<%= require 'json'; {:credentials => @credentials}.to_json %>")
     $credentials_ensure = file
   } else {

diff --git a/spec/classes/master_spec.rb b/spec/classes/master_spec.rb
@@ -270,7 +270,7 @@
         should contain_mesos__property(
                    'master_credentials'
                ).with({
-                          'value' => '/etc/mesos/master-credentials',
+                          'value' => 'file:///etc/mesos/master-credentials',
                       })
       end