Merge pull request #75 from fuze/master

Fixed spec tests and default recipe to handle new st2auth config

Author: armab

attributes/config.rb

@@ -17,7 +17,7 @@
   auth_enable: true,
   auth_mode: 'standalone',
   auth_backend: 'flat_file',
-  auth_backend_kwargs: { file_path: '/etc/st2/htpasswd' },
+  auth_backend_kwargs: { 'file_path' => '/etc/st2/htpasswd' },
 
   syslog_enabled: false,
   syslog_host: '127.0.0.1',

recipes/default.rb

@@ -11,9 +11,11 @@
 include_recipe 'stackstorm::_services'
 
 # Generate username & password for htpasswd flat-file authentication
-htpasswd ':add credentials to htpasswd file' do
-  file node['stackstorm']['config']['auth_standalone_file']
-  user node['stackstorm']['username']
-  password node['stackstorm']['password']
-  action :add
+if node['stackstorm']['config']['auth_backend'] == 'flat_file'
+  htpasswd ':add credentials to htpasswd file' do
+    file node['stackstorm']['config']['auth_backend_kwargs']['file_path']
+    user node['stackstorm']['username']
+    password node['stackstorm']['password']
+    action :add
+  end
 end

spec/recipes/config_spec.rb

@@ -168,7 +168,9 @@
               'auth_use_ssl' => false,
               'auth_debug' => false,
               'auth_enable' => true,
-              'auth_standalone_file' => '/etc/st2/htpasswd',
+              'auth_mode' => 'standalone',
+              'auth_backend' => 'flat_file',
+              'auth_backend_kwargs' => { 'file_path' => '/etc/st2/htpasswd' },
 
               'syslog_enabled' => false,
               'syslog_host' => '127.0.0.1',