openstack/puppet-octavia
Code Issues Proposed changes

Do not manage admin role

Browse Source 
The admin role is now created during bootstrap and is managed by
puppet-keystone.

Change-Id: Ic17c6eac1d25c399356827fad5d82a1cf2f66bdf
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-19 13:06:54 +09:00
parent ca4b8e58b6
commit f391b0939d
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/roles.pp
View File

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

12
spec/classes/octavia_roles_spec.rb
View File

@@ -2,11 +2,6 @@ require 'spec_helper'
describe 'octavia::roles' do
let :params do
{
}
end
shared_examples_for 'octavia-roles' 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_quota_admin')
is_expected.to contain_keystone_role('load-balancer_admin')
is_expected.to contain_keystone_role('admin')
end
end
context 'when using custom roles' do
before do
params.merge!({
let :params do
{
:role_names => ['foo', 'bar', 'krispy']
})
}
end
it 'creates custom keystone roles' do
is_expected.to contain_keystone_role('foo')