X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Fclasses%2Fkeystone_endpoint_spec.rb;h=217d791f9d624df3754123c29c404609534f8a09;hb=71a236efd9f45828d875a0a5fd025108bb1dcada;hp=61b596abd44f7cb7dfcf6f88fe185a19b3364eb0;hpb=b8fa2c1a5ec9dbcd1d2f9e9b41afdde4c603aa35;p=dsa-puppet.git

diff --git a/3rdparty/modules/keystone/spec/classes/keystone_endpoint_spec.rb b/3rdparty/modules/keystone/spec/classes/keystone_endpoint_spec.rb
index 61b596ab..217d791f 100644
--- a/3rdparty/modules/keystone/spec/classes/keystone_endpoint_spec.rb
+++ b/3rdparty/modules/keystone/spec/classes/keystone_endpoint_spec.rb
@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe 'keystone::endpoint' do
 
-  it { should contain_keystone_service('keystone').with(
+  it { is_expected.to contain_keystone_service('keystone').with(
     :ensure      => 'present',
     :type        => 'identity',
     :description => 'OpenStack Identity Service'
   )}
 
   describe 'with default parameters' do
-    it { should contain_keystone_endpoint('RegionOne/keystone').with(
+    it { is_expected.to contain_keystone_endpoint('RegionOne/keystone').with(
       :ensure       => 'present',
       :public_url   => 'http://127.0.0.1:5000/v2.0',
       :admin_url    => 'http://127.0.0.1:35357/v2.0',
@@ -26,7 +26,7 @@ describe 'keystone::endpoint' do
         :internal_url => 'https://identity-int.some.tld/some/internal/endpoint' }
     end
 
-    it { should contain_keystone_endpoint('RegionOne/keystone').with(
+    it { is_expected.to contain_keystone_endpoint('RegionOne/keystone').with(
       :ensure       => 'present',
       :public_url   => 'https://identity.some.tld/the/main/endpoint/v42.6',
       :admin_url    => 'https://identity-int.some.tld/some/admin/endpoint/v42.6',
@@ -41,59 +41,11 @@ describe 'keystone::endpoint' do
     end
 
     it 'internal_url should default to public_url' do
-      should contain_keystone_endpoint('RegionOne/keystone').with(
+      is_expected.to contain_keystone_endpoint('RegionOne/keystone').with(
         :ensure       => 'present',
         :public_url   => 'https://identity.some.tld/the/main/endpoint/v2.0',
         :internal_url => 'https://identity.some.tld/the/main/endpoint/v2.0'
       )
     end
   end
-
-  describe 'with deprecated parameters' do
-
-    let :params do
-      { :public_address   => '10.0.0.1',
-        :admin_address    => '10.0.0.2',
-        :internal_address => '10.0.0.3',
-        :public_port      => '23456',
-        :admin_port       => '12345',
-        :region           => 'RegionTwo',
-        :version          => 'v3.0' }
-    end
-
-    it { should contain_keystone_endpoint('RegionTwo/keystone').with(
-      :ensure       => 'present',
-      :public_url   => 'http://10.0.0.1:23456/v3.0',
-      :admin_url    => 'http://10.0.0.2:12345/v3.0',
-      :internal_url => 'http://10.0.0.3:23456/v3.0'
-    )}
-
-    describe 'public_address overrides public_url' do
-      let :params do
-        { :public_address => '10.0.0.1',
-          :public_port    => '12345',
-          :public_url     => 'http://10.10.10.10:23456/v3.0' }
-      end
-
-      it { should contain_keystone_endpoint('RegionOne/keystone').with(
-        :ensure     => 'present',
-        :public_url => 'http://10.0.0.1:12345/v2.0'
-      )}
-    end
-  end
-
-  describe 'with overridden deprecated internal_port' do
-
-    let :params do
-      { :internal_port => '12345' }
-    end
-
-    it { should contain_keystone_endpoint('RegionOne/keystone').with(
-      :ensure       => 'present',
-      :public_url   => 'http://127.0.0.1:5000/v2.0',
-      :admin_url    => 'http://127.0.0.1:35357/v2.0',
-      :internal_url => 'http://127.0.0.1:12345/v2.0'
-    )}
-  end
-
 end