Add support for Manila policy.json

Change-Id: Idcd042913e33c65641aa0a1874811fe9f2efb793

manifests/api.pp

@@ -86,6 +86,7 @@ class manila::api (
 
   include ::manila::deps
   include ::manila::params
+  include ::manila::policy
   require ::keystone::python
 
   if $service_port {

manifests/params.pp

@@ -9,6 +9,7 @@ class manila::params {
   $client_package       = 'python-manilaclient'
   $db_sync_command      = 'manila-manage db sync'
   $lio_package_name     = 'targetcli'
+  $group                = 'manila'
 
   case $::osfamily {
     'Debian': {

manifests/policy.pp

@@ -0,0 +1,46 @@
+# == Class: manila::policy
+#
+# Configure the manila policies
+#
+# === Parameters
+#
+# [*policies*]
+#   (optional) Set of policies to configure for manila
+#   Example :
+#     {
+#       'manila-context_is_admin' => {
+#         'key' => 'context_is_admin',
+#         'value' => 'true'
+#       },
+#       'manila-default' => {
+#         'key' => 'default',
+#         'value' => 'rule:admin_or_owner'
+#       }
+#     }
+#   Defaults to empty hash.
+#
+# [*policy_path*]
+#   (optional) Path to the manila policy.json file
+#   Defaults to /etc/manila/policy.json
+#
+class manila::policy (
+  $policies    = {},
+  $policy_path = '/etc/manila/policy.json',
+) {
+
+  include ::manila::deps
+  include ::manila::params
+
+  validate_hash($policies)
+
+  Openstacklib::Policy::Base {
+    file_path  => $policy_path,
+    file_user  => 'root',
+    file_group => $::manila::params::group,
+  }
+
+  create_resources('openstacklib::policy::base', $policies)
+
+  oslo::policy { 'manila_config': policy_file => $policy_path }
+
+}

releasenotes/notes/policy-json-50a35d8dcfd6e5a9.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Support for policy.json configuration has been implemented in the same
+    way as other modules with manila::policy class.

spec/classes/manila_api_spec.rb

@@ -20,6 +20,7 @@ describe 'manila::api' do
       req_params
     end
 
+    it { is_expected.to contain_class('manila::policy') }
     it { is_expected.to contain_service('manila-api').with(
       'hasstatus' => true,
       'ensure' => 'running',
@@ -44,6 +45,7 @@ describe 'manila::api' do
     let :params do
       req_params.merge({'default_share_type' => 'default'})
     end
+    it { is_expected.to contain_class('manila::policy') }
     it 'should configure the default share type' do
       is_expected.to contain_manila_config('DEFAULT/default_share_type').with(
         :value => 'default'
@@ -55,6 +57,7 @@ describe 'manila::api' do
     let :params do
       req_params.merge({'service_workers' => '4'})
     end
+    it { is_expected.to contain_class('manila::policy') }
     it 'should configure the share workers' do
       is_expected.to contain_manila_config('DEFAULT/osapi_share_workers').with(
         :value => '4'
@@ -66,6 +69,7 @@ describe 'manila::api' do
     let :params do
       req_params.merge({'bind_host' => '192.168.1.3'})
     end
+    it { is_expected.to contain_class('manila::policy') }
     it 'should configure manila api correctly' do
       is_expected.to contain_manila_config('DEFAULT/osapi_share_listen').with(
        :value => '192.168.1.3'
@@ -77,6 +81,7 @@ describe 'manila::api' do
     let :params do
       req_params.merge({'enable_proxy_headers_parsing' => true})
     end
+    it { is_expected.to contain_class('manila::policy') }
     it 'should configure manila api correctly' do
       is_expected.to contain_manila_config('oslo_middleware/enable_proxy_headers_parsing').with(
        :value => true
@@ -88,6 +93,7 @@ describe 'manila::api' do
     let :params do
       req_params.merge({'enabled' => false})
     end
+    it { is_expected.to contain_class('manila::policy') }
     it 'should stop the service' do
       is_expected.to contain_service('manila-api').with_ensure('stopped')
     end
@@ -100,6 +106,7 @@ describe 'manila::api' do
     let :params do
       req_params.merge({'sync_db' => false})
     end
+    it { is_expected.to contain_class('manila::policy') }
     it 'should not include manila::db::sync' do
       is_expected.to_not contain_class('manila::db::sync')
     end
@@ -109,6 +116,7 @@ describe 'manila::api' do
     let :params do
       req_params.merge({'manage_service' => false})
     end
+    it { is_expected.to contain_class('manila::policy') }
     it 'should not change the state of the service' do
       is_expected.to contain_service('manila-api').without_ensure
     end
@@ -119,6 +127,7 @@ describe 'manila::api' do
       req_params.merge({ :ratelimits => '(GET, "*", .*, 100, MINUTE);(POST, "*", .*, 200, MINUTE)' })
     end
 
+    it { is_expected.to contain_class('manila::policy') }
     it { is_expected.to contain_manila_api_paste_ini('filter:ratelimit/limits').with(
       :value => '(GET, "*", .*, 100, MINUTE);(POST, "*", .*, 200, MINUTE)'
     )}

spec/classes/manila_policy_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe 'manila::policy' do
+
+  shared_examples_for 'manila policies' do
+    let :params do
+      {
+        :policy_path => '/etc/manila/policy.json',
+        :policies    => {
+          'context_is_admin' => {
+            'key'   => 'context_is_admin',
+            'value' => 'foo:bar'
+          }
+        }
+      }
+    end
+
+    it 'set up the policies' do
+      is_expected.to contain_openstacklib__policy__base('context_is_admin').with({
+        :key        => 'context_is_admin',
+        :value      => 'foo:bar',
+        :file_user  => 'root',
+        :file_group => 'manila',
+      })
+      is_expected.to contain_oslo__policy('manila_config').with(
+        :policy_file => '/etc/manila/policy.json',
+      )
+    end
+  end
+
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
+
+      it_configures 'manila policies'
+    end
+  end
+end