summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-11-09 21:01:51 +0100
committerGiulio Fidente <gfidente@redhat.com>2016-11-11 16:22:41 +0100
commit3f16ce2c0c0f73fc863d33022033112084a9b6c5 (patch)
tree9eca72cb5ca54464e82db32d47f44c7f1caaca4b /spec
parentf5a20ed5911324311b02773dde8a917eb82ddc0c (diff)
Normalize civetweb binding address if IPv6
The civetweb binding format is IP:PORT; this change ensures the IP is enclosed in brackets if IPv6. To do so we add the bind_ip and bind_port parameters to the rgw service class. Change-Id: Ib84fa3479c2598bff7e89ad60a1c7d5f2c22c18c Co-Authored-By: Lukas Bezdicka <social@v3.sk> Related-Bug: #1636515
Diffstat (limited to 'spec')
-rw-r--r--spec/classes/tripleo_profile_base_ceph_rgw_spec.rb16
1 files changed, 12 insertions, 4 deletions
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 *',