Configure civetweb bind socket via puppet-tripleo
When the civetweb binding IP is version 6 it needs to be enclosed in brackets or the bind socket parsing fails. The mangling happens in puppet-tripleo, this change updates the templates to push the appropriate hiera keys. Change-Id: Ic7004d768ed5e0f2382ffaa57961ea0ef9162527 Closes-Bug: #1636515 Depends-On: Ib84fa3479c2598bff7e89ad60a1c7d5f2c22c18c
This commit is contained in:
parent
f754c57ee1
commit
76b0edcb77
@ -55,15 +55,9 @@ outputs:
|
||||
- tripleo::profile::base::ceph::rgw::rgw_key: {get_param: CephRgwKey}
|
||||
tripleo::profile::base::ceph::rgw::keystone_admin_token: {get_param: AdminToken}
|
||||
tripleo::profile::base::ceph::rgw::keystone_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
|
||||
ceph::profile::params::frontend_type: 'civetweb'
|
||||
ceph_rgw_civetweb_bind_address: {get_param: [ServiceNetMap, CephRgwNetwork]}
|
||||
ceph::profile::params::rgw_frontends:
|
||||
list_join:
|
||||
- ''
|
||||
- - 'civetweb port='
|
||||
- '%{hiera("ceph_rgw_civetweb_bind_address")}'
|
||||
- ':'
|
||||
- {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||
tripleo::profile::base::ceph::rgw::civetweb_bind_ip: {get_param: [ServiceNetMap, CephRgwNetwork]}
|
||||
tripleo::profile::base::ceph::rgw::civetweb_bind_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||
ceph::params::user_radosgw: ceph
|
||||
tripleo.ceph_rgw.firewall_rules:
|
||||
'122 ceph rgw':
|
||||
dport: {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||
|
Loading…
x
Reference in New Issue
Block a user