openstack/puppet-octavia
Code Issues Proposed changes

Merge "Import base parameter types for ::policy"

Browse Source
This commit is contained in:
Zuul
2025-09-29 15:23:28 +00:00
committed by Gerrit Code Review
parent 693e4422d4 e5aa65a630
commit 6a31dce1ac
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/policy.pp
View File

@@ -46,13 +46,13 @@
# Defaults to false. # Defaults to false.
# #
class octavia::policy ( class octavia::policy (
$enforce_scope = $facts['os_service_default'], $enforce_scope = $facts['os_service_default'],
$enforce_new_defaults = $facts['os_service_default'], $enforce_new_defaults = $facts['os_service_default'],
Hash $policies = {}, Openstacklib::Policies $policies = {},
$policy_path = '/etc/octavia/policy.yaml', Stdlib::Absolutepath $policy_path = '/etc/octavia/policy.yaml',
$policy_default_rule = $facts['os_service_default'], $policy_default_rule = $facts['os_service_default'],
$policy_dirs = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include octavia::deps include octavia::deps
include octavia::params include octavia::params
@@ -64,7 +64,6 @@ class octavia::policy (
file_group => $octavia::params::group, file_group => $octavia::params::group,
file_format => 'yaml', file_format => 'yaml',
purge_config => $purge_config, purge_config => $purge_config,
tag => 'octavia',
} }
create_resources('openstacklib::policy', { $policy_path => $policy_parameters }) create_resources('openstacklib::policy', { $policy_path => $policy_parameters })

2
spec/classes/octavia_policy_spec.rb
View File

@@ -33,7 +33,6 @@ describe 'octavia::policy' do
:file_group => 'octavia', :file_group => 'octavia',
:file_format => 'yaml', :file_format => 'yaml',
:purge_config => false, :purge_config => false,
:tag => 'octavia',
) )
is_expected.to contain_oslo__policy('octavia_config').with( is_expected.to contain_oslo__policy('octavia_config').with(
:enforce_scope => false, :enforce_scope => false,
@@ -64,7 +63,6 @@ describe 'octavia::policy' do
:file_group => 'octavia', :file_group => 'octavia',
:file_format => 'yaml', :file_format => 'yaml',
:purge_config => true, :purge_config => true,
:tag => 'octavia',
) )
is_expected.to contain_oslo__policy('octavia_config').with( is_expected.to contain_oslo__policy('octavia_config').with(
:enforce_scope => false, :enforce_scope => false,