openstack/puppet-octavia
Code Issues Proposed changes

Merge "Do not manage admin role"

Browse Source
This commit is contained in:
Zuul
2025-08-23 04:48:40 +00:00
committed by Gerrit Code Review
parent a8ec5522a1 f391b0939d
commit 892509807b
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/roles.pp
View File

@@ -7,24 +7,20 @@
# [*role_names*] # [*role_names*]
# (optional) Create keystone roles to comply with Octavia policies. # (optional) Create keystone roles to comply with Octavia policies.
# Defaults to ['load-balancer_observer', 'load-balancer_global_observer', # Defaults to ['load-balancer_observer', 'load-balancer_global_observer',
# 'load-balancer_member', 'load-balancer_quota_admin', 'load-balancer_admin', # 'load-balancer_member', 'load-balancer_quota_admin', 'load-balancer_admin']
# 'admin']
# #
class octavia::roles ( class octavia::roles (
$role_names = [ Array[String[1]] $role_names = [
'load-balancer_observer', 'load-balancer_observer',
'load-balancer_global_observer', 'load-balancer_global_observer',
'load-balancer_member', 'load-balancer_member',
'load-balancer_quota_admin', 'load-balancer_quota_admin',
'load-balancer_admin', 'load-balancer_admin',
'admin',
] ]
) { ) {
warning('The octavia::roles class is deprecated and will be removed') warning('The octavia::roles class is deprecated and will be removed')
if $role_names {
keystone_role { $role_names: keystone_role { $role_names:
ensure => present, ensure => present,
} }
} }
}

12
spec/classes/octavia_roles_spec.rb
View File

@@ -2,11 +2,6 @@ require 'spec_helper'
describe 'octavia::roles' do describe 'octavia::roles' do
let :params do
{
}
end
shared_examples_for 'octavia-roles' do shared_examples_for 'octavia-roles' do
context 'when using default args' do context 'when using default args' do
@@ -16,15 +11,14 @@ describe 'octavia::roles' do
is_expected.to contain_keystone_role('load-balancer_member') is_expected.to contain_keystone_role('load-balancer_member')
is_expected.to contain_keystone_role('load-balancer_quota_admin') is_expected.to contain_keystone_role('load-balancer_quota_admin')
is_expected.to contain_keystone_role('load-balancer_admin') is_expected.to contain_keystone_role('load-balancer_admin')
is_expected.to contain_keystone_role('admin')
end end
end end
context 'when using custom roles' do context 'when using custom roles' do
before do let :params do
params.merge!({ {
:role_names => ['foo', 'bar', 'krispy'] :role_names => ['foo', 'bar', 'krispy']
}) }
end end
it 'creates custom keystone roles' do it 'creates custom keystone roles' do
is_expected.to contain_keystone_role('foo') is_expected.to contain_keystone_role('foo')