3 files changed, 15 insertions, 21 deletions
diff --git a/spec/classes/tripleo_firewall_spec.rb b/spec/classes/tripleo_firewall_spec.rb
index 1270aa7..3116a51 100644
--- a/spec/classes/tripleo_firewall_spec.rb
+++ b/spec/classes/tripleo_firewall_spec.rb
@@ -76,7 +76,8 @@ describe 'tripleo::firewall' do
             '301 add custom application 2' => {'port' => '8081', 'proto' => 'tcp', 'action' => 'accept'},
             '302 fwd custom cidr 1'        => {'chain' => 'FORWARD', 'destination' => '192.0.2.0/24'},
             '303 add custom application 3' => {'dport' => '8081', 'proto' => 'tcp', 'action' => 'accept'},
-            '304 add custom application 4' => {'sport' => '1000', 'proto' => 'tcp', 'action' => 'accept'}
+            '304 add custom application 4' => {'sport' => '1000', 'proto' => 'tcp', 'action' => 'accept'},
+            '305 add gre rule'             => {'proto' => 'gre'}
           }
         )
       end
@@ -109,6 +110,7 @@ describe 'tripleo::firewall' do
           :action => 'accept',
           :state  => ['NEW'],
         )
+        is_expected.to contain_firewall('305 add gre rule').without(:state)
       end
     end
 
diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index d1f0b6b..63dbe71 100644
--- a/spec/classes/tripleo_profile_base_aodh_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
@@ -30,7 +30,6 @@ describe 'tripleo::profile::base::aodh::api' do
         is_expected.to contain_class('tripleo::profile::base::aodh')
         is_expected.to_not contain_class('aodh::api')
         is_expected.to_not contain_class('aodh::wsgi::apache')
-        is_expected.to_not contain_aodh_config('api/enable_combination_alarms')
       end
     end
 
@@ -42,23 +41,8 @@ describe 'tripleo::profile::base::aodh::api' do
       it 'should trigger complete configuration' do
         is_expected.to contain_class('aodh::api')
         is_expected.to contain_class('aodh::wsgi::apache')
-        is_expected.to contain_aodh_config('api/enable_combination_alarms').with_value('false')
       end
     end
-
-    context 'with step 4 and enable combo alarms' do
-      let(:params) { {
-        :step                      => 4,
-        :enable_combination_alarms => true
-      } }
-
-      it 'should trigger complete configuration' do
-        is_expected.to contain_class('aodh::api')
-        is_expected.to contain_class('aodh::wsgi::apache')
-        is_expected.to contain_aodh_config('api/enable_combination_alarms').with_value('true')
-      end
-    end
-
   end
 
 
diff --git a/spec/classes/tripleo_profile_base_ceph_rgw_spec.rb b/spec/classes/tripleo_profile_base_ceph_rgw_spec.rb
index e9459d0..88f971b 100644
--- a/spec/classes/tripleo_profile_base_ceph_rgw_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceph_rgw_spec.rb
@@ -30,7 +30,9 @@ describe 'tripleo::profile::base::ceph::rgw' do
       {
         :keystone_admin_token => 'token',
         :keystone_url         => 'url',
-        :rgw_key              => 'key'
+        :rgw_key              => 'key',
+        :civetweb_bind_ip     => '2001:db8:0:1234:0:567:8:1',
+        :civetweb_bind_port   => '8888',
       }
     end
 
@@ -39,7 +41,7 @@ describe 'tripleo::profile::base::ceph::rgw' do
       it 'should do nothing' do
         is_expected.to contain_class('tripleo::profile::base::ceph::rgw')
         is_expected.to contain_class('tripleo::profile::base::ceph')
-        is_expected.to_not contain_class('ceph::profile::rgw')
+        is_expected.to_not contain_class('ceph::rgw')
       end
     end
 
@@ -47,7 +49,10 @@ describe 'tripleo::profile::base::ceph::rgw' do
       let(:params) { default_params.merge({ :step => 3 }) }
       it 'should include rgw configuration' do
         is_expected.to contain_class('tripleo::profile::base::ceph')
-        is_expected.to contain_class('ceph::profile::rgw')
+        is_expected.to contain_ceph__rgw('radosgw.gateway').with(
+          :frontend_type => 'civetweb',
+          :rgw_frontends => 'civetweb port=[2001:db8:0:1234:0:567:8:1]:8888'
+        )
         is_expected.to contain_ceph__key('client.radosgw.gateway').with(
           :secret  => 'key',
           :cap_mon => 'allow *',
@@ -62,7 +67,10 @@ describe 'tripleo::profile::base::ceph::rgw' do
       let(:params) { default_params.merge({ :step => 4 }) }
       it 'should include rgw configuration' do
         is_expected.to contain_class('tripleo::profile::base::ceph')
-        is_expected.to contain_class('ceph::profile::rgw')
+        is_expected.to contain_ceph__rgw('radosgw.gateway').with(
+          :frontend_type => 'civetweb',
+          :rgw_frontends => 'civetweb port=[2001:db8:0:1234:0:567:8:1]:8888'
+        )
         is_expected.to contain_ceph__key('client.radosgw.gateway').with(
           :secret  => 'key',
           :cap_mon => 'allow *',