diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index fe58a81..933e7be 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -90,9 +90,9 @@ class zaqar::keystone::auth(
   $system_scope           = 'all',
   $system_roles           = [],
   $configure_endpoint     = true,
-  $configure_service      = true,
   $configure_user         = true,
   $configure_user_role    = true,
+  $configure_service      = true,
   $service_description    = 'OpenStack Messaging Service',
 ) {
 
@@ -104,6 +104,7 @@ class zaqar::keystone::auth(
     configure_user      => $configure_user,
     configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,
+    configure_service   => $configure_service,
     service_type        => $service_type,
     service_description => $service_description,
     service_name        => $service_name,
diff --git a/spec/classes/zaqar_keystone_auth_spec.rb b/spec/classes/zaqar_keystone_auth_spec.rb
index d647c8b..54322a4 100644
--- a/spec/classes/zaqar_keystone_auth_spec.rb
+++ b/spec/classes/zaqar_keystone_auth_spec.rb
@@ -15,6 +15,7 @@ describe 'zaqar::keystone::auth' do
         :configure_user      => true,
         :configure_user_role => true,
         :configure_endpoint  => true,
+        :configure_service   => true,
         :service_name        => 'zaqar',
         :service_type        => 'messaging',
         :service_description => 'OpenStack Messaging Service',
@@ -44,6 +45,7 @@ describe 'zaqar::keystone::auth' do
           :configure_endpoint  => false,
           :configure_user      => false,
           :configure_user_role => false,
+          :configure_service   => false,
           :service_description => 'Alternative OpenStack Messaging Service',
           :service_name        => 'alt_service',
           :service_type        => 'alt_messaging',
@@ -57,6 +59,7 @@ describe 'zaqar::keystone::auth' do
         :configure_user      => false,
         :configure_user_role => false,
         :configure_endpoint  => false,
+        :configure_service   => false,
         :service_name        => 'alt_service',
         :service_type        => 'alt_messaging',
         :service_description => 'Alternative OpenStack Messaging Service',