diff --git a/spec/classes/gnocchi_keystone_auth_spec.rb b/spec/classes/gnocchi_keystone_auth_spec.rb
index cc8d0028..86bd6ab7 100644
--- a/spec/classes/gnocchi_keystone_auth_spec.rb
+++ b/spec/classes/gnocchi_keystone_auth_spec.rb
@@ -5,125 +5,76 @@
 require 'spec_helper'
 
 describe 'gnocchi::keystone::auth' do
-
-  shared_examples 'gnocchi-keystone-auth' do
+  shared_examples_for 'gnocchi::keystone::auth' do
     context 'with default class parameters' do
       let :params do
-        { :password => 'gnocchi_password',
-          :tenant   => 'foobar' }
+        { :password => 'gnocchi_password' }
       end
 
-      it { is_expected.to contain_keystone_user('gnocchi').with(
-        :ensure   => 'present',
-        :password => 'gnocchi_password',
-      ) }
-
-      it { is_expected.to contain_keystone_user_role('gnocchi@foobar').with(
-        :ensure  => 'present',
-        :roles   => ['admin']
-      )}
-
-      it { is_expected.to contain_keystone_service('gnocchi::metric').with(
-        :ensure      => 'present',
-        :description => 'OpenStack Metric Service'
-      ) }
-
-      it { is_expected.to contain_keystone_endpoint('RegionOne/gnocchi::metric').with(
-        :ensure       => 'present',
-        :public_url   => 'http://127.0.0.1:8041',
-        :admin_url    => 'http://127.0.0.1:8041',
-        :internal_url => 'http://127.0.0.1:8041',
+      it { is_expected.to contain_keystone__resource__service_identity('gnocchi').with(
+        :configure_user      => true,
+        :configure_user_role => true,
+        :configure_endpoint  => true,
+        :service_name        => 'gnocchi',
+        :service_type        => 'metric',
+        :service_description => 'OpenStack Metric Service',
+        :region              => 'RegionOne',
+        :auth_name           => 'gnocchi',
+        :password            => 'gnocchi_password',
+        :email               => 'gnocchi@localhost',
+        :tenant              => 'services',
+        :public_url          => 'http://127.0.0.1:8041',
+        :internal_url        => 'http://127.0.0.1:8041',
+        :admin_url           => 'http://127.0.0.1:8041',
       ) }
     end
 
-    context 'when overriding URL parameters' do
+    context 'when overriding parameters' do
       let :params do
-        { :password     => 'gnocchi_password',
-          :public_url   => 'https://10.10.10.10:80',
-          :internal_url => 'http://10.10.10.11:81',
-          :admin_url    => 'http://10.10.10.12:81' }
-      end
-
-      it { is_expected.to contain_keystone_endpoint('RegionOne/gnocchi::metric').with(
-        :ensure       => 'present',
-        :public_url   => 'https://10.10.10.10:80',
-        :internal_url => 'http://10.10.10.11:81',
-        :admin_url    => 'http://10.10.10.12:81'
-      ) }
-    end
-
-    context 'when overriding auth name' do
-      let :params do
-        { :password => 'foo',
-          :auth_name => 'gnocchiany' }
-      end
-
-      it { is_expected.to contain_keystone_user('gnocchiany') }
-      it { is_expected.to contain_keystone_user_role('gnocchiany@services') }
-      it { is_expected.to contain_keystone_service('gnocchi::metric') }
-      it { is_expected.to contain_keystone_endpoint('RegionOne/gnocchi::metric') }
-    end
-
-    context 'when overriding service name' do
-      let :params do
-        { :service_name => 'gnocchi_service',
-          :auth_name    => 'gnocchi',
-          :password     => 'gnocchi_password' }
-      end
-
-      it { is_expected.to contain_keystone_user('gnocchi') }
-      it { is_expected.to contain_keystone_user_role('gnocchi@services') }
-      it { is_expected.to contain_keystone_service('gnocchi_service::metric') }
-      it { is_expected.to contain_keystone_endpoint('RegionOne/gnocchi_service::metric') }
-    end
-
-    context 'when disabling user configuration' do
-
-      let :params do
-        {
-          :password       => 'gnocchi_password',
-          :configure_user => false
-        }
-      end
-
-      it { is_expected.not_to contain_keystone_user('gnocchi') }
-      it { is_expected.to contain_keystone_user_role('gnocchi@services') }
-      it { is_expected.to contain_keystone_service('gnocchi::metric').with(
-        :ensure      => 'present',
-        :description => 'OpenStack Metric Service'
-      ) }
-
-    end
-
-    context 'when disabling user and user role configuration' do
-
-      let :params do
-        {
-          :password            => 'gnocchi_password',
+        { :password            => 'gnocchi_password',
+          :auth_name           => 'alt_gnocchi',
+          :email               => 'alt_gnocchi@alt_localhost',
+          :tenant              => 'alt_service',
+          :configure_endpoint  => false,
           :configure_user      => false,
-          :configure_user_role => false
-        }
+          :configure_user_role => false,
+          :service_description => 'Alternative OpenStack Metric Service',
+          :service_name        => 'alt_service',
+          :service_type        => 'alt_metric',
+          :region              => 'RegionTwo',
+          :public_url          => 'https://10.10.10.10:80',
+          :internal_url        => 'http://10.10.10.11:81',
+          :admin_url           => 'http://10.10.10.12:81' }
       end
 
-      it { is_expected.not_to contain_keystone_user('gnocchi') }
-      it { is_expected.not_to contain_keystone_user_role('gnocchi@services') }
-      it { is_expected.to contain_keystone_service('gnocchi::metric').with(
-        :ensure      => 'present',
-        :description => 'OpenStack Metric Service'
+      it { is_expected.to contain_keystone__resource__service_identity('gnocchi').with(
+        :configure_user      => false,
+        :configure_user_role => false,
+        :configure_endpoint  => false,
+        :service_name        => 'alt_service',
+        :service_type        => 'alt_metric',
+        :service_description => 'Alternative OpenStack Metric Service',
+        :region              => 'RegionTwo',
+        :auth_name           => 'alt_gnocchi',
+        :password            => 'gnocchi_password',
+        :email               => 'alt_gnocchi@alt_localhost',
+        :tenant              => 'alt_service',
+        :public_url          => 'https://10.10.10.10:80',
+        :internal_url        => 'http://10.10.10.11:81',
+        :admin_url           => 'http://10.10.10.12:81',
       ) }
-
     end
   end
 
   on_supported_os({
-    :supported_os   => OSDefaults.get_supported_os
+    :supported_os => OSDefaults.get_supported_os
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts())
       end
 
-      it_behaves_like 'gnocchi-keystone-auth'
+      it_behaves_like 'gnocchi::keystone::auth'
     end
   end
 end