From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 23 Sep 2016 19:25:35 +0000 (+0000)
Subject: Merge "Add in rspec-puppet-facts support"
X-Git-Tag: opnfv-6.0.0~567
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=942b2a2b8c87b471b57b7d304be923c81d7eb55f;p=apex-puppet-tripleo.git

Merge "Add in rspec-puppet-facts support"
---

942b2a2b8c87b471b57b7d304be923c81d7eb55f
diff --cc spec/classes/tripleo_profile_base_swift_proxy_spec.rb
index c1febab,04c63d1..68d7dde
--- a/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_swift_proxy_spec.rb
@@@ -63,42 -63,15 +63,30 @@@ describe 'tripleo::profile::base::swift
        end
      end
  
 +    context 'with ipv4, ipv6 and fqdn memcache servers' do
 +      before :each do
 +        params.merge!(
 +          :step             => 4,
 +          :memcache_servers => ['192.168.0.1', '::2', 'myserver.com'],
 +        )
 +      end
 +
 +      it 'configure swift proxy cache with ips and fqdn' do
 +        is_expected.to contain_class('swift::proxy::cache').with({
 +          :memcache_servers => ['192.168.0.1:11211', '[::2]:11211', 'myserver.com:11211']
 +        })
 +      end
 +    end
 +
    end
  
-   context 'on Debian platforms' do
-     let :facts do
-       { :osfamily       => 'Debian',
-         :processorcount => 1 }
-     end
- 
-     it_configures 'tripleo swift proxy base profile'
-   end
+   on_supported_os.each do |os, facts|
+     context "on #{os}" do
+       let(:facts) do
+         facts.merge({})
+       end
  
-   context 'on RedHat platforms' do
-     let :facts do
-       {
-         :osfamily               => 'RedHat',
-         :operatingsystemrelease => '7.1',
-         :processorcount         => 1,
-       }
+       it_behaves_like 'tripleo::profile::base::swift::proxy'
      end
- 
-     it_configures 'tripleo swift proxy base profile'
    end
- 
  end