Merge "policy.json: Allow one to manage them from the puppet module"
This commit is contained in:
commit
e6a2055fdc
@ -90,8 +90,10 @@ class ironic::api (
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
include ironic::params
|
include ironic::params
|
||||||
|
include ironic::policy
|
||||||
|
|
||||||
Ironic_config<||> ~> Service['ironic-api']
|
Ironic_config<||> ~> Service['ironic-api']
|
||||||
|
Class['ironic::policy'] ~> Service['ironic-api']
|
||||||
|
|
||||||
# Configure ironic.conf
|
# Configure ironic.conf
|
||||||
ironic_config {
|
ironic_config {
|
||||||
@ -102,6 +104,7 @@ class ironic::api (
|
|||||||
|
|
||||||
# Install package
|
# Install package
|
||||||
if $::ironic::params::api_package {
|
if $::ironic::params::api_package {
|
||||||
|
Package['ironic-api'] -> Class['ironic::policy']
|
||||||
Package['ironic-api'] -> Service['ironic-api']
|
Package['ironic-api'] -> Service['ironic-api']
|
||||||
Package['ironic-api'] -> Ironic_config<||>
|
Package['ironic-api'] -> Ironic_config<||>
|
||||||
package { 'ironic-api':
|
package { 'ironic-api':
|
||||||
|
29
manifests/policy.pp
Normal file
29
manifests/policy.pp
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
# == Class: ironic::policy
|
||||||
|
#
|
||||||
|
# Configure the ironic policies
|
||||||
|
#
|
||||||
|
# === Parameters
|
||||||
|
#
|
||||||
|
# [*policies*]
|
||||||
|
# (optional) Set of policies to configure for ironic
|
||||||
|
# Example : { 'ironic-context_is_admin' => {'context_is_admin' => 'true'}, 'ironic-default' => {'default' => 'rule:admin_or_owner'} }
|
||||||
|
# Defaults to empty hash.
|
||||||
|
#
|
||||||
|
# [*policy_path*]
|
||||||
|
# (optional) Path to the ironic policy.json file
|
||||||
|
# Defaults to /etc/ironic/policy.json
|
||||||
|
#
|
||||||
|
class ironic::policy (
|
||||||
|
$policies = {},
|
||||||
|
$policy_path = '/etc/ironic/policy.json',
|
||||||
|
) {
|
||||||
|
|
||||||
|
validate_hash($policies)
|
||||||
|
|
||||||
|
Openstacklib::Policy::Base {
|
||||||
|
file_path => $policy_path,
|
||||||
|
}
|
||||||
|
|
||||||
|
create_resources('openstacklib::policy::base', $policies)
|
||||||
|
|
||||||
|
}
|
@ -42,6 +42,7 @@ describe 'ironic::api' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it { should contain_class('ironic::params') }
|
it { should contain_class('ironic::params') }
|
||||||
|
it { should contain_class('ironic::policy') }
|
||||||
|
|
||||||
it 'installs ironic api package' do
|
it 'installs ironic api package' do
|
||||||
if platform_params.has_key?(:api_package)
|
if platform_params.has_key?(:api_package)
|
||||||
|
41
spec/classes/ironic_policy_spec.rb
Normal file
41
spec/classes/ironic_policy_spec.rb
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
require 'spec_helper'
|
||||||
|
|
||||||
|
describe 'ironic::policy' do
|
||||||
|
|
||||||
|
shared_examples_for 'ironic policies' do
|
||||||
|
let :params do
|
||||||
|
{
|
||||||
|
:policy_path => '/etc/ironic/policy.json',
|
||||||
|
:policies => {
|
||||||
|
'context_is_admin' => {
|
||||||
|
'key' => 'context_is_admin',
|
||||||
|
'value' => 'foo:bar'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'set up the policies' do
|
||||||
|
should contain_openstacklib__policy__base('context_is_admin').with({
|
||||||
|
:key => 'context_is_admin',
|
||||||
|
:value => 'foo:bar'
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'on Debian platforms' do
|
||||||
|
let :facts do
|
||||||
|
{ :osfamily => 'Debian' }
|
||||||
|
end
|
||||||
|
|
||||||
|
it_configures 'ironic policies'
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'on RedHat platforms' do
|
||||||
|
let :facts do
|
||||||
|
{ :osfamily => 'RedHat' }
|
||||||
|
end
|
||||||
|
|
||||||
|
it_configures 'ironic policies'
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user