Merge "Configure auth_strategy"

manifests/api.pp

@@ -285,6 +285,7 @@ running as a standalone service, or httpd for being run by a httpd server")
     'DEFAULT/osapi_volume_base_URL':    value => $osapi_volume_base_url;
     'DEFAULT/osapi_max_limit':          value => $osapi_max_limit;
     'DEFAULT/osapi_volume_listen_port': value => $osapi_volume_listen_port;
+    'DEFAULT/auth_strategy':            value => $auth_strategy;
   }
 
   cinder_config {

releasenotes/notes/configure-auth_strategy-f8005172e383ec94.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - auth_strategy will now be configured in cinder.conf
+    with the value passed for cinder::api::auth_strategy

spec/classes/cinder_api_spec.rb

@@ -52,6 +52,9 @@ describe 'cinder::api' do
         is_expected.to contain_cinder_config('DEFAULT/os_region_name').with(
          :value => '<SERVICE DEFAULT>'
         )
+        is_expected.to contain_cinder_config('DEFAULT/auth_strategy').with(
+         :value => 'keystone'
+        )
 
         is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_name').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cinder_config('DEFAULT/os_privileged_user_password').with_value('<SERVICE DEFAULT>')
@@ -268,6 +271,17 @@ describe 'cinder::api' do
       )}
     end
 
+    describe 'with a custom auth_strategy' do
+      let :params do
+        req_params.merge({'auth_strategy' => 'noauth'})
+      end
+      it 'should configure the auth_strategy to noauth' do
+        is_expected.to contain_cinder_config('DEFAULT/auth_strategy').with(
+          :value => 'noauth'
+        )
+      end
+    end
+
     describe 'with a custom osapi_max_limit' do
       let :params do
         req_params.merge({'osapi_max_limit' => '10000'})