openstack
/
fuel-library
Code Issues Proposed changes

[ceph] Employ radosgw built-in frontend 

As of firefly (v0.80), ceph object gateway is running on civetweb
(embedded into the ceph-radosgw daemon) instead of apache and fastcgi.
Using civetweb simplifies the ceph object gateway installation and
configuration.

Change-Id: Idba61e094390e3c75a6e5d9b35a8e8e47a2a696f
Closes-Bug: #1671808
This commit is contained in:
Michael Polenchuk 2017-03-15 16:55:55 +04:00
parent ccdcbae82a
commit d38e1a399c
7 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack/manifests/ha/radosgw.pp
View File

@ -43,7 +43,7 @@ class openstack::ha::radosgw (
internal_virtual_ip => $internal_virtual_ip, internal_virtual_ip => $internal_virtual_ip,
ipaddresses => $ipaddresses, ipaddresses => $ipaddresses,
listen_port => 8080, listen_port => 8080,
balancermember_port => 6780, balancermember_port => 7480,
public_virtual_ip => $public_virtual_ip, public_virtual_ip => $public_virtual_ip,
server_names => $server_names, server_names => $server_names,
haproxy_config_options => { haproxy_config_options => {

4
deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb
View File

@ -33,7 +33,7 @@ require 'spec_helper'
should contain_openstack__ha__haproxy_service('object-storage').with( should contain_openstack__ha__haproxy_service('object-storage').with(
'order' => '130', 'order' => '130',
'listen_port' => 8080, 'listen_port' => 8080,
'balancermember_port' => 6780, 'balancermember_port' => 7480,
'public' => true, 'public' => true,
'public_ssl' => true, 'public_ssl' => true,
'public_ssl_path' => '/var/lib/fuel/haproxy/public_radosgw.pem', 'public_ssl_path' => '/var/lib/fuel/haproxy/public_radosgw.pem',
@ -45,7 +45,7 @@ require 'spec_helper'
should contain_openstack__ha__haproxy_service('object-storage-baremetal').with( should contain_openstack__ha__haproxy_service('object-storage-baremetal').with(
'order' => '135', 'order' => '135',
'listen_port' => 8080, 'listen_port' => 8080,
'balancermember_port' => 6780, 'balancermember_port' => 7480,
'public_virtual_ip' => false, 'public_virtual_ip' => false,
'internal_virtual_ip' => '192.168.0.2', 'internal_virtual_ip' => '192.168.0.2',
'haproxy_config_options' => haproxy_config_opts, 'haproxy_config_options' => haproxy_config_opts,

12
deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp
View File

@ -55,7 +55,6 @@ class osnailyfacter::ceph::radosgw {
fsid => $fsid, fsid => $fsid,
} }
include ::tweaks::apache_wrappers
include ::ceph::params include ::ceph::params
####################################### #######################################
@ -70,7 +69,8 @@ class osnailyfacter::ceph::radosgw {
####################################### #######################################
ceph::rgw { $gateway_name: ceph::rgw { $gateway_name:
frontend_type => 'apache-proxy-fcgi', frontend_type => 'civetweb',
rgw_frontends => 'civetweb port=7480',
rgw_print_continue => true, rgw_print_continue => true,
keyring_path => "/etc/ceph/client.${gateway_name}", keyring_path => "/etc/ceph/client.${gateway_name}",
rgw_data => "/var/lib/ceph/radosgw-${gateway_name}", rgw_data => "/var/lib/ceph/radosgw-${gateway_name}",
@ -91,14 +91,6 @@ class osnailyfacter::ceph::radosgw {
ensure => directory, ensure => directory,
} }
ceph::rgw::apache_proxy_fcgi { $gateway_name:
docroot => '/var/www/radosgw',
rgw_port => '6780',
apache_purge_configs => false,
apache_purge_vhost => false,
custom_apache_ports => hiera_array('apache_ports', ['0.0.0.0:80']),
}
if ! $use_syslog { if ! $use_syslog {
ceph_config { ceph_config {
"client.${gateway_name}/log_file": value => $rgw_log_file; "client.${gateway_name}/log_file": value => $rgw_log_file;

2
deployment/puppet/osnailyfacter/manifests/firewall/firewall.pp
View File

@ -65,7 +65,7 @@ class osnailyfacter::firewall::firewall {
$vxlan_udp_port = 4789 $vxlan_udp_port = 4789
$ceph_mon_port = 6789 $ceph_mon_port = 6789
$ceph_osd_port = '6800-7100' $ceph_osd_port = '6800-7100'
$radosgw_port = 6780 $radosgw_port = 7480
$corosync_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/corosync') $corosync_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/corosync')
$memcache_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/memcache') $memcache_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/memcache')

3
tests/noop/spec/hosts/ceph/radosgw_spec.rb
View File

@ -75,7 +75,8 @@ describe manifest do
it 'should contain ceph::rgw' do it 'should contain ceph::rgw' do
should contain_ceph__rgw(gateway_name).with( should contain_ceph__rgw(gateway_name).with(
'frontend_type' => 'apache-proxy-fcgi', 'frontend_type' => 'civetweb',
'rgw_frontends' => 'civetweb port=7480',
) )
end end

2
tests/noop/spec/hosts/firewall/firewall_spec.rb
View File

@ -304,7 +304,7 @@ describe manifest do
it 'should configure firewall' do it 'should configure firewall' do
should contain_firewall('012 RadosGW allow').with( should contain_firewall('012 RadosGW allow').with(
'chain' => 'INPUT', 'chain' => 'INPUT',
'dport' => [ '6780', '8080' ], 'dport' => [ '7480', '8080' ],
'proto' => 'tcp', 'proto' => 'tcp',
'action' => 'accept', 'action' => 'accept',
) )

4
tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb
View File

@ -46,7 +46,7 @@ describe manifest do
'ipaddresses' => ipaddresses, 'ipaddresses' => ipaddresses,
'server_names' => server_names, 'server_names' => server_names,
'listen_port' => 8080, 'listen_port' => 8080,
'balancermember_port' => 6780, 'balancermember_port' => 7480,
'public' => true, 'public' => true,
'public_ssl' => public_ssl_radosgw, 'public_ssl' => public_ssl_radosgw,
'require_service' => 'radosgw-api', 'require_service' => 'radosgw-api',
@ -63,7 +63,7 @@ describe manifest do
'ipaddresses' => ipaddresses, 'ipaddresses' => ipaddresses,
'server_names' => server_names, 'server_names' => server_names,
'listen_port' => 8080, 'listen_port' => 8080,
'balancermember_port' => 6780, 'balancermember_port' => 7480,
'public_virtual_ip' => false, 'public_virtual_ip' => false,
'internal_virtual_ip' => baremetal_virtual_ip, 'internal_virtual_ip' => baremetal_virtual_ip,
'haproxy_config_options' => { 'haproxy_config_options' => {