Browse Source

[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
changes/46/445946/3
Michael Polenchuk 2 years ago
parent
commit
d38e1a399c

+ 1
- 1
deployment/puppet/openstack/manifests/ha/radosgw.pp View File

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

+ 2
- 2
deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb View File

@@ -33,7 +33,7 @@ require 'spec_helper'
33 33
       should contain_openstack__ha__haproxy_service('object-storage').with(
34 34
         'order'                  => '130',
35 35
         'listen_port'            => 8080,
36
-        'balancermember_port'    => 6780,
36
+        'balancermember_port'    => 7480,
37 37
         'public'                 => true,
38 38
         'public_ssl'             => true,
39 39
         'public_ssl_path'        => '/var/lib/fuel/haproxy/public_radosgw.pem',
@@ -45,7 +45,7 @@ require 'spec_helper'
45 45
       should contain_openstack__ha__haproxy_service('object-storage-baremetal').with(
46 46
         'order'                  => '135',
47 47
         'listen_port'            => 8080,
48
-        'balancermember_port'    => 6780,
48
+        'balancermember_port'    => 7480,
49 49
         'public_virtual_ip'      => false,
50 50
         'internal_virtual_ip'    => '192.168.0.2',
51 51
         'haproxy_config_options' => haproxy_config_opts,

+ 2
- 10
deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp View File

@@ -55,7 +55,6 @@ class osnailyfacter::ceph::radosgw {
55 55
       fsid => $fsid,
56 56
     }
57 57
 
58
-    include ::tweaks::apache_wrappers
59 58
     include ::ceph::params
60 59
 
61 60
 #######################################
@@ -70,7 +69,8 @@ class osnailyfacter::ceph::radosgw {
70 69
 #######################################
71 70
 
72 71
     ceph::rgw { $gateway_name:
73
-      frontend_type      => 'apache-proxy-fcgi',
72
+      frontend_type      => 'civetweb',
73
+      rgw_frontends      => 'civetweb port=7480',
74 74
       rgw_print_continue => true,
75 75
       keyring_path       => "/etc/ceph/client.${gateway_name}",
76 76
       rgw_data           => "/var/lib/ceph/radosgw-${gateway_name}",
@@ -91,14 +91,6 @@ class osnailyfacter::ceph::radosgw {
91 91
       ensure => directory,
92 92
     }
93 93
 
94
-    ceph::rgw::apache_proxy_fcgi { $gateway_name:
95
-      docroot              => '/var/www/radosgw',
96
-      rgw_port             => '6780',
97
-      apache_purge_configs => false,
98
-      apache_purge_vhost   => false,
99
-      custom_apache_ports  => hiera_array('apache_ports', ['0.0.0.0:80']),
100
-    }
101
-
102 94
     if ! $use_syslog {
103 95
       ceph_config {
104 96
         "client.${gateway_name}/log_file":      value => $rgw_log_file;

+ 1
- 1
deployment/puppet/osnailyfacter/manifests/firewall/firewall.pp View File

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

+ 2
- 1
tests/noop/spec/hosts/ceph/radosgw_spec.rb View File

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

+ 1
- 1
tests/noop/spec/hosts/firewall/firewall_spec.rb View File

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

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

@@ -46,7 +46,7 @@ describe manifest do
46 46
             'ipaddresses'            => ipaddresses,
47 47
             'server_names'           => server_names,
48 48
             'listen_port'            => 8080,
49
-            'balancermember_port'    => 6780,
49
+            'balancermember_port'    => 7480,
50 50
             'public'                 => true,
51 51
             'public_ssl'             => public_ssl_radosgw,
52 52
             'require_service'        => 'radosgw-api',
@@ -63,7 +63,7 @@ describe manifest do
63 63
             'ipaddresses'            => ipaddresses,
64 64
             'server_names'           => server_names,
65 65
             'listen_port'            => 8080,
66
-            'balancermember_port'    => 6780,
66
+            'balancermember_port'    => 7480,
67 67
             'public_virtual_ip'      => false,
68 68
             'internal_virtual_ip'    => baremetal_virtual_ip,
69 69
             'haproxy_config_options' => {

Loading…
Cancel
Save