Merge "Switch cinder api to use WSGI"

This commit is contained in:
Jenkins 2017-03-07 11:00:37 +00:00 committed by Gerrit Code Review
commit 7fe441424b
2 changed files with 41 additions and 4 deletions

View File

@ -168,6 +168,31 @@ class openstack_tasks::openstack_cinder::openstack_cinder {
auth_version => $keystone_api,
}
# support Ocata. First in UCA, then in MOS
$repo_setup = hiera_hash('repo_setup', {})
$repo_type = pick_default($repo_setup['repo_type'], '')
if $repo_type != 'uca' {
$service_name = undef
}
else {
class { 'osnailyfacter::apache':
listen_ports => hiera_array('apache_ports', ['0.0.0.0:80', '0.0.0.0:8888', '0.0.0.0:5000', '0.0.0.0:35357', '0.0.0.0:8777','0.0.0.0:8042']),
}
# set to false as we terminate SSL on HAProxy side
$ssl = false
class { '::cinder::wsgi::apache':
ssl => $ssl,
priority => '35',
bind_host => $bind_host,
}
$service_name = 'httpd'
}
class { 'cinder::api':
os_region_name => $region,
bind_host => $bind_host,
@ -184,6 +209,7 @@ class openstack_tasks::openstack_cinder::openstack_cinder {
sync_db => $primary_controller,
default_volume_type => $default_volume_type,
enable_proxy_headers_parsing => true,
service_name => $service_name
}
class { 'cinder::scheduler': }

View File

@ -141,6 +141,7 @@ class osnailyfacter::globals::globals {
$keystone_api_address = get_network_role_property('keystone/api', 'ipaddr')
$ceilometer_api_address = get_network_role_property('ceilometer/api', 'ipaddr')
$aodh_api_address = get_network_role_property('aodh/api', 'ipaddr')
$cinder_api_address = get_network_role_property('cinder/api', 'ipaddr')
$token_provider = hiera('token_provider','keystone.token.providers.fernet.Provider')
@ -440,14 +441,25 @@ class osnailyfacter::globals::globals {
# Define ceilometer-related parameters
$ceilometer = hiera('ceilometer', {})
$use_ceilometer = $ceilometer['enabled']
# Listen directives with host required for ip_based vhosts
$apache_ports_defaults = ['127.0.0.1:80',
if $repo_hash['repo_type'] == 'uca' {
# Listen directives with host required for ip_based vhosts
$apache_ports_defaults = ['127.0.0.1:80',
"${horizon_address}:80",
"${apache_api_proxy_address}:8888",
"${keystone_api_address}:5000",
"${keystone_api_address}:35357",
"${cinder_api_address}:8776"
]
}
else {
# Listen directives with host required for ip_based vhosts
$apache_ports_defaults = ['127.0.0.1:80',
"${horizon_address}:80",
"${apache_api_proxy_address}:8888",
"${keystone_api_address}:5000",
"${keystone_api_address}:35357",
]
}
$apache_ports = hiera_array('apache_ports', unique(
$use_ceilometer ? {
@ -455,7 +467,6 @@ class osnailyfacter::globals::globals {
false => $apache_ports_defaults,
})
)
$ceilometer_defaults = {
'alarm_history_time_to_live' => '604800',
'event_time_to_live' => '604800',