Enable upload of load files
In this commit, scratch directory default size, group ownership and permissions are changed to 16G, sys_protected and 775 respectively to allow saving of large temp files in this directory by dcorch-sysinv-api-proxy and sysinv-api during the upload of large files such as iso image. In addition, haproxy config for these web apps is also updated to prevent connection drop during this long running operation. Story: 2007403 Task: 39838 Change-Id: Ib36049c2410e41a5ed67d19fa0d539c306117de5 Signed-off-by: Tee Ngo <Tee.Ngo@windriver.com>
This commit is contained in:
parent
2030c15400
commit
f229cf12c0
|
@ -27,6 +27,7 @@ include ::platform::etcd::bootstrap
|
|||
|
||||
# Puppet classes to enable initial controller unlock
|
||||
include ::platform::drbd::dockerdistribution::bootstrap
|
||||
include ::platform::filesystem::scratch
|
||||
include ::platform::filesystem::backup
|
||||
include ::platform::filesystem::kubelet
|
||||
include ::platform::mtce::bootstrap
|
||||
|
|
|
@ -14,6 +14,8 @@ class platform::dcorch::params (
|
|||
$cinder_enable_ports = false,
|
||||
$patch_api_proxy_port = 25491,
|
||||
$identity_api_proxy_port = 25000,
|
||||
$sysinv_api_proxy_client_timeout = '600s',
|
||||
$sysinv_api_proxy_server_timeout = '600s',
|
||||
) {
|
||||
include ::platform::params
|
||||
|
||||
|
@ -94,9 +96,11 @@ class platform::dcorch::haproxy
|
|||
private_port => $nova_api_proxy_port,
|
||||
}
|
||||
platform::haproxy::proxy { 'dcorch-sysinv-api-proxy':
|
||||
server_name => 's-dcorch-sysinv-api-proxy',
|
||||
public_port => $sysinv_api_proxy_port,
|
||||
private_port => $sysinv_api_proxy_port,
|
||||
server_name => 's-dcorch-sysinv-api-proxy',
|
||||
public_port => $sysinv_api_proxy_port,
|
||||
private_port => $sysinv_api_proxy_port,
|
||||
client_timeout => $sysinv_api_proxy_client_timeout,
|
||||
server_timeout => $sysinv_api_proxy_server_timeout,
|
||||
}
|
||||
platform::haproxy::proxy { 'dcorch-cinder-api-proxy':
|
||||
server_name => 's-cinder-dc-api-proxy',
|
||||
|
@ -129,6 +133,8 @@ class platform::dcorch::haproxy
|
|||
public_ip_address => $::platform::haproxy::params::private_ip_address,
|
||||
public_port => $sysinv_api_proxy_port + 1,
|
||||
private_port => $sysinv_api_proxy_port,
|
||||
client_timeout => $sysinv_api_proxy_client_timeout,
|
||||
server_timeout => $sysinv_api_proxy_server_timeout,
|
||||
}
|
||||
# Configure rules for https enabled patching api proxy admin endpoint.
|
||||
platform::haproxy::proxy { 'dcorch-patch-api-proxy-admin':
|
||||
|
|
|
@ -11,6 +11,7 @@ define platform::filesystem (
|
|||
$fs_options,
|
||||
$fs_use_all = false,
|
||||
$ensure = present,
|
||||
$group = 'root',
|
||||
$mode = '0750',
|
||||
) {
|
||||
include ::platform::filesystem::params
|
||||
|
@ -78,7 +79,7 @@ define platform::filesystem (
|
|||
-> file { $mountpoint:
|
||||
ensure => 'directory',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
group => $group,
|
||||
mode => $mode,
|
||||
}
|
||||
|
||||
|
@ -102,6 +103,9 @@ define platform::filesystem (
|
|||
-> exec {"Change ${mountpoint} dir permissions":
|
||||
command => "chmod ${mode} ${mountpoint}",
|
||||
}
|
||||
-> exec {"Change ${mountpoint} dir group":
|
||||
command => "chgrp ${group} ${mountpoint}",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -178,18 +182,28 @@ class platform::filesystem::scratch::params (
|
|||
$mountpoint = '/scratch',
|
||||
$devmapper = '/dev/mapper/cgts--vg-scratch--lv',
|
||||
$fs_type = 'ext4',
|
||||
$fs_options = ' '
|
||||
$fs_options = ' ',
|
||||
$group = 'sys_protected',
|
||||
$mode = '0770'
|
||||
) { }
|
||||
|
||||
class platform::filesystem::scratch
|
||||
inherits ::platform::filesystem::scratch::params {
|
||||
|
||||
if $::personality == 'controller' {
|
||||
$default_lv_size = '16'
|
||||
} else {
|
||||
$default_lv_size = $lv_size
|
||||
}
|
||||
|
||||
platform::filesystem { $lv_name:
|
||||
lv_name => $lv_name,
|
||||
lv_size => $lv_size,
|
||||
lv_size => $default_lv_size,
|
||||
mountpoint => $mountpoint,
|
||||
fs_type => $fs_type,
|
||||
fs_options => $fs_options
|
||||
fs_options => $fs_options,
|
||||
group => $group,
|
||||
mode => $mode
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@ class platform::sysinv::params (
|
|||
$region_name = undef,
|
||||
$service_create = false,
|
||||
$fm_catalog_info = 'faultmanagement:fm:internalURL',
|
||||
$server_timeout = '600s',
|
||||
) { }
|
||||
|
||||
class platform::sysinv
|
||||
|
@ -82,9 +83,10 @@ class platform::sysinv::haproxy
|
|||
include ::platform::haproxy::params
|
||||
|
||||
platform::haproxy::proxy { 'sysinv-restapi':
|
||||
server_name => 's-sysinv',
|
||||
public_port => $api_port,
|
||||
private_port => $api_port,
|
||||
server_name => 's-sysinv',
|
||||
public_port => $api_port,
|
||||
private_port => $api_port,
|
||||
server_timeout => $server_timeout,
|
||||
}
|
||||
|
||||
# Configure rules for DC https enabled admin endpoint.
|
||||
|
@ -96,6 +98,7 @@ class platform::sysinv::haproxy
|
|||
public_ip_address => $::platform::haproxy::params::private_ip_address,
|
||||
public_port => $api_port + 1,
|
||||
private_port => $api_port,
|
||||
server_timeout => $server_timeout,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue