Merge "Add service role by default"

manifests/keystone/auth.pp

@@ -21,7 +21,7 @@
 #
 # [*roles*]
 #   (Optional) List of roles assigned to neutron user.
-#   Defaults to ['admin']
+#   Defaults to ['admin', 'service']
 #
 # [*system_scope*]
 #   (Optional) Scope for system operations.
@@ -86,7 +86,7 @@ class zaqar::keystone::auth (
   $internal_url           = 'http://127.0.0.1:8888',
   $region                 = 'RegionOne',
   $tenant                 = 'services',
-  $roles                  = ['admin'],
+  $roles                  = ['admin', 'service'],
   $system_scope           = 'all',
   $system_roles           = [],
   $configure_endpoint     = true,

releasenotes/notes/service-role-92fe736a9d03ab40.yaml

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

spec/classes/zaqar_keystone_auth_spec.rb

@@ -24,7 +24,7 @@ describe 'zaqar::keystone::auth' do
         :password            => 'zaqar_password',
         :email               => 'zaqar@localhost',
         :tenant              => 'services',
-        :roles               => ['admin'],
+        :roles               => ['admin', 'service'],
         :system_scope        => 'all',
         :system_roles        => [],
         :public_url          => 'http://127.0.0.1:8888',
@@ -39,7 +39,7 @@ describe 'zaqar::keystone::auth' do
           :auth_name           => 'alt_zaqar',
           :email               => 'alt_zaqar@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 'zaqar::keystone::auth' do
         :password            => 'zaqar_password',
         :email               => 'alt_zaqar@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',