diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 0a739c5..248aeca 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -21,7 +21,7 @@ # # [*roles*] # (Optional) List of roles assigned to magnum user. -# Defaults to ['admin'] +# Defaults to ['admin', 'service'] # # [*system_scope*] # (Optional) Scope for system operations. @@ -82,7 +82,7 @@ class magnum::keystone::auth ( String[1] $auth_name = 'magnum', String[1] $email = 'magnum@localhost', String[1] $tenant = 'services', - Array[String[1]] $roles = ['admin'], + Array[String[1]] $roles = ['admin', 'service'], String[1] $system_scope = 'all', Array[String[1]] $system_roles = [], Boolean $configure_endpoint = true, diff --git a/releasenotes/notes/service-role-7f26675ee1608cb3.yaml b/releasenotes/notes/service-role-7f26675ee1608cb3.yaml new file mode 100644 index 0000000..339d291 --- /dev/null +++ b/releasenotes/notes/service-role-7f26675ee1608cb3.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The ``magnumg::keystone::auth`` class now adds the ``service`` role by + default. Set the ``roles`` parameter not to add the role. diff --git a/spec/classes/magnum_keystone_auth_spec.rb b/spec/classes/magnum_keystone_auth_spec.rb index 70971c1..dd258b2 100644 --- a/spec/classes/magnum_keystone_auth_spec.rb +++ b/spec/classes/magnum_keystone_auth_spec.rb @@ -24,7 +24,7 @@ describe 'magnum::keystone::auth' do :password => 'magnum_password', :email => 'magnum@localhost', :tenant => 'services', - :roles => ['admin'], + :roles => ['admin', 'service'], :system_scope => 'all', :system_roles => [], :public_url => 'http://127.0.0.1:9511/v1', @@ -39,7 +39,7 @@ describe 'magnum::keystone::auth' do :auth_name => 'alt_magnum', :email => 'alt_magnum@alt_localhost', :tenant => 'alt_service', - :roles => ['admin', 'service'], + :roles => ['admin'], :system_scope => 'alt_all', :system_roles => ['admin', 'member', 'reader'], :configure_endpoint => false, @@ -68,7 +68,7 @@ describe 'magnum::keystone::auth' do :password => 'magnum_password', :email => 'alt_magnum@alt_localhost', :tenant => 'alt_service', - :roles => ['admin', 'service'], + :roles => ['admin'], :system_scope => 'alt_all', :system_roles => ['admin', 'member', 'reader'], :public_url => 'https://10.10.10.10:80',