summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-21 12:57:56 +0000
committerGerrit Code Review <review@openstack.org>2017-03-21 12:57:56 +0000
commit146e9c428af2a56a7bf8340c4b554a40407f7463 (patch)
tree52d24f5638cfd34c0592138a56319629069b6ecf
parent77320dedde7925d95e2217436369de0353824c12 (diff)
parentd38e1a399cb0793690781d95f688ce7061f9072d (diff)
Merge "[ceph] Employ radosgw built-in frontend"
-rw-r--r--deployment/puppet/openstack/manifests/ha/radosgw.pp2
-rw-r--r--deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb4
-rw-r--r--deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp12
-rw-r--r--deployment/puppet/osnailyfacter/manifests/firewall/firewall.pp2
-rw-r--r--tests/noop/spec/hosts/ceph/radosgw_spec.rb3
-rw-r--r--tests/noop/spec/hosts/firewall/firewall_spec.rb2
-rw-r--r--tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb4
7 files changed, 11 insertions, 18 deletions
diff --git a/deployment/puppet/openstack/manifests/ha/radosgw.pp b/deployment/puppet/openstack/manifests/ha/radosgw.pp
index 607975e..82bb89a 100644
--- a/deployment/puppet/openstack/manifests/ha/radosgw.pp
+++ b/deployment/puppet/openstack/manifests/ha/radosgw.pp
@@ -43,7 +43,7 @@ class openstack::ha::radosgw (
43 internal_virtual_ip => $internal_virtual_ip, 43 internal_virtual_ip => $internal_virtual_ip,
44 ipaddresses => $ipaddresses, 44 ipaddresses => $ipaddresses,
45 listen_port => 8080, 45 listen_port => 8080,
46 balancermember_port => 6780, 46 balancermember_port => 7480,
47 public_virtual_ip => $public_virtual_ip, 47 public_virtual_ip => $public_virtual_ip,
48 server_names => $server_names, 48 server_names => $server_names,
49 haproxy_config_options => { 49 haproxy_config_options => {
diff --git a/deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb b/deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb
index 5894b30..23d3e10 100644
--- a/deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb
+++ b/deployment/puppet/openstack/spec/classes/openstack_ha_radosgw_spec.rb
@@ -33,7 +33,7 @@ require 'spec_helper'
33 should contain_openstack__ha__haproxy_service('object-storage').with( 33 should contain_openstack__ha__haproxy_service('object-storage').with(
34 'order' => '130', 34 'order' => '130',
35 'listen_port' => 8080, 35 'listen_port' => 8080,
36 'balancermember_port' => 6780, 36 'balancermember_port' => 7480,
37 'public' => true, 37 'public' => true,
38 'public_ssl' => true, 38 'public_ssl' => true,
39 'public_ssl_path' => '/var/lib/fuel/haproxy/public_radosgw.pem', 39 'public_ssl_path' => '/var/lib/fuel/haproxy/public_radosgw.pem',
@@ -45,7 +45,7 @@ require 'spec_helper'
45 should contain_openstack__ha__haproxy_service('object-storage-baremetal').with( 45 should contain_openstack__ha__haproxy_service('object-storage-baremetal').with(
46 'order' => '135', 46 'order' => '135',
47 'listen_port' => 8080, 47 'listen_port' => 8080,
48 'balancermember_port' => 6780, 48 'balancermember_port' => 7480,
49 'public_virtual_ip' => false, 49 'public_virtual_ip' => false,
50 'internal_virtual_ip' => '192.168.0.2', 50 'internal_virtual_ip' => '192.168.0.2',
51 'haproxy_config_options' => haproxy_config_opts, 51 'haproxy_config_options' => haproxy_config_opts,
diff --git a/deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp b/deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp
index 192c464..40e1a22 100644
--- a/deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp
+++ b/deployment/puppet/osnailyfacter/manifests/ceph/radosgw.pp
@@ -55,7 +55,6 @@ class osnailyfacter::ceph::radosgw {
55 fsid => $fsid, 55 fsid => $fsid,
56 } 56 }
57 57
58 include ::tweaks::apache_wrappers
59 include ::ceph::params 58 include ::ceph::params
60 59
61####################################### 60#######################################
@@ -70,7 +69,8 @@ class osnailyfacter::ceph::radosgw {
70####################################### 69#######################################
71 70
72 ceph::rgw { $gateway_name: 71 ceph::rgw { $gateway_name:
73 frontend_type => 'apache-proxy-fcgi', 72 frontend_type => 'civetweb',
73 rgw_frontends => 'civetweb port=7480',
74 rgw_print_continue => true, 74 rgw_print_continue => true,
75 keyring_path => "/etc/ceph/client.${gateway_name}", 75 keyring_path => "/etc/ceph/client.${gateway_name}",
76 rgw_data => "/var/lib/ceph/radosgw-${gateway_name}", 76 rgw_data => "/var/lib/ceph/radosgw-${gateway_name}",
@@ -91,14 +91,6 @@ class osnailyfacter::ceph::radosgw {
91 ensure => directory, 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 if ! $use_syslog { 94 if ! $use_syslog {
103 ceph_config { 95 ceph_config {
104 "client.${gateway_name}/log_file": value => $rgw_log_file; 96 "client.${gateway_name}/log_file": value => $rgw_log_file;
diff --git a/deployment/puppet/osnailyfacter/manifests/firewall/firewall.pp b/deployment/puppet/osnailyfacter/manifests/firewall/firewall.pp
index 4738ac3..cc1a5e9 100644
--- a/deployment/puppet/osnailyfacter/manifests/firewall/firewall.pp
+++ b/deployment/puppet/osnailyfacter/manifests/firewall/firewall.pp
@@ -65,7 +65,7 @@ class osnailyfacter::firewall::firewall {
65 $vxlan_udp_port = 4789 65 $vxlan_udp_port = 4789
66 $ceph_mon_port = 6789 66 $ceph_mon_port = 6789
67 $ceph_osd_port = '6800-7100' 67 $ceph_osd_port = '6800-7100'
68 $radosgw_port = 6780 68 $radosgw_port = 7480
69 69
70 $corosync_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/corosync') 70 $corosync_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/corosync')
71 $memcache_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/memcache') 71 $memcache_networks = get_routable_networks_for_network_role($network_scheme, 'mgmt/memcache')
diff --git a/tests/noop/spec/hosts/ceph/radosgw_spec.rb b/tests/noop/spec/hosts/ceph/radosgw_spec.rb
index f427e7f..854d04b 100644
--- a/tests/noop/spec/hosts/ceph/radosgw_spec.rb
+++ b/tests/noop/spec/hosts/ceph/radosgw_spec.rb
@@ -75,7 +75,8 @@ describe manifest do
75 75
76 it 'should contain ceph::rgw' do 76 it 'should contain ceph::rgw' do
77 should contain_ceph__rgw(gateway_name).with( 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 end 81 end
81 82
diff --git a/tests/noop/spec/hosts/firewall/firewall_spec.rb b/tests/noop/spec/hosts/firewall/firewall_spec.rb
index 5dd4c0b..541423d 100644
--- a/tests/noop/spec/hosts/firewall/firewall_spec.rb
+++ b/tests/noop/spec/hosts/firewall/firewall_spec.rb
@@ -304,7 +304,7 @@ describe manifest do
304 it 'should configure firewall' do 304 it 'should configure firewall' do
305 should contain_firewall('012 RadosGW allow').with( 305 should contain_firewall('012 RadosGW allow').with(
306 'chain' => 'INPUT', 306 'chain' => 'INPUT',
307 'dport' => [ '6780', '8080' ], 307 'dport' => [ '7480', '8080' ],
308 'proto' => 'tcp', 308 'proto' => 'tcp',
309 'action' => 'accept', 309 'action' => 'accept',
310 ) 310 )
diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb
index b12dc5f..80ff206 100644
--- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb
+++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-radosgw_spec.rb
@@ -46,7 +46,7 @@ describe manifest do
46 'ipaddresses' => ipaddresses, 46 'ipaddresses' => ipaddresses,
47 'server_names' => server_names, 47 'server_names' => server_names,
48 'listen_port' => 8080, 48 'listen_port' => 8080,
49 'balancermember_port' => 6780, 49 'balancermember_port' => 7480,
50 'public' => true, 50 'public' => true,
51 'public_ssl' => public_ssl_radosgw, 51 'public_ssl' => public_ssl_radosgw,
52 'require_service' => 'radosgw-api', 52 'require_service' => 'radosgw-api',
@@ -63,7 +63,7 @@ describe manifest do
63 'ipaddresses' => ipaddresses, 63 'ipaddresses' => ipaddresses,
64 'server_names' => server_names, 64 'server_names' => server_names,
65 'listen_port' => 8080, 65 'listen_port' => 8080,
66 'balancermember_port' => 6780, 66 'balancermember_port' => 7480,
67 'public_virtual_ip' => false, 67 'public_virtual_ip' => false,
68 'internal_virtual_ip' => baremetal_virtual_ip, 68 'internal_virtual_ip' => baremetal_virtual_ip,
69 'haproxy_config_options' => { 69 'haproxy_config_options' => {