Merge "Configure civetweb bind socket via puppet-tripleo"

This commit is contained in:
Jenkins 2016-11-12 13:11:42 +00:00 committed by Gerrit Code Review
commit b339ee8331

@ -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]}