Merge "Add service role by default"

manifests/keystone/auth.pp

@@ -21,7 +21,7 @@
 #
 # [*roles*]
 #   (Optional) List of roles assigned to octavia user.
-#   Defaults to ['admin']
+#   Defaults to ['admin', 'service']
 #
 # [*system_scope*]
 #   (Optional) Scope for system operations.
@@ -83,7 +83,7 @@ class octavia::keystone::auth (
   String[1] $auth_name                    = 'octavia',
   String[1] $email                        = 'octavia@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,

releasenotes/notes/service-role-722a430c5ee0c573.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``octavia::keystone::auth`` class now adds the ``service`` role by
+    default. Set the ``roles`` parameter not to add the role.

spec/classes/octavia_keystone_auth_spec.rb

@@ -24,7 +24,7 @@ describe 'octavia::keystone::auth' do
         :password            => 'octavia_password',
         :email               => 'octavia@localhost',
         :tenant              => 'services',
-        :roles               => ['admin'],
+        :roles               => ['admin', 'service'],
         :system_scope        => 'all',
         :system_roles        => [],
         :public_url          => 'http://127.0.0.1:9876',
@@ -39,7 +39,7 @@ describe 'octavia::keystone::auth' do
           :auth_name           => 'alt_octavia',
           :email               => 'alt_octavia@alt_localhost',
           :tenant              => 'alt_service',
-          :roles               => ['admin', 'service'],
+          :roles               => ['admin'],
           :system_scope        => 'atl_all',
           :system_roles        => ['admin', 'member', 'reader'],
           :configure_endpoint  => false,
@@ -68,7 +68,7 @@ describe 'octavia::keystone::auth' do
         :password            => 'octavia_password',
         :email               => 'alt_octavia@alt_localhost',
         :tenant              => 'alt_service',
-        :roles               => ['admin', 'service'],
+        :roles               => ['admin'],
         :system_scope        => 'atl_all',
         :system_roles        => ['admin', 'member', 'reader'],
         :public_url          => 'https://10.10.10.10:80',