Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TVAULT-4339 Haproxy timeouts to be set with default values for TrilioDMAPI #460

Open
wants to merge 2 commits into
base: v4.1maintenance
Choose a base branch
from
Open

TVAULT-4339 Haproxy timeouts to be set with default values for TrilioDMAPI #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb1927
TVAULT-4339 Haproxy timeouts to be set with default values for Trilio…
May 4, 2021
6bb678c
TVAULT-4118 kolla ansible script should be in sync with TVO UI for st…
May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions kolla-ansible/ansible/roles/triliovault/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ triliovault_services:
port: "{{ triliovault_datamover_api_port }}"
listen_port: "{{ triliovault_datamover_api_listen_port }}"
tls_backend: "{{ triliovault_enable_tls_backend }}"
haproxy_http_request_timeout: "{{ haproxy_http_request_timeout }}"
haproxy_queue_timeout: "{{ haproxy_queue_timeout }}"
haproxy_connect_timeout: "{{ haproxy_connect_timeout }}"
haproxy_client_timeout: "{{ haproxy_client_timeout }}"
haproxy_server_timeout: "{{ haproxy_server_timeout }}"
haproxy_check_timeout: "{{ haproxy_check_timeout }}"
haproxy_defaults_balance: "{{ haproxy_defaults_balance }}"
haproxy_defaults_max_connections: "{{ haproxy_defaults_max_connections }}"
triliovault_datamover_api_external:
enabled: "{{ enable_triliovault }}"
mode: "http"
Expand Down Expand Up @@ -164,7 +172,7 @@ triliovault_docker_password: ""
triliovault_docker_registry: "docker.io"


## triliovault backup target possible values: 'nfs'/'amazon_s3'/'ceph_s3'
## triliovault backup target possible values: 'nfs'/'amazon_s3'/'other_s3_compatible'
triliovault_backup_target: 'nfs'

### 'NFS' backup target details
Expand All @@ -175,17 +183,17 @@ triliovault_nfs_shares: '192.168.122.101:/opt/tvault'
triliovault_nfs_options: 'nolock,soft,timeo=180,intr,lookupcache=none'


### 'amazon_s3/ceph_s3' backup target details
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 access key
### 'amazon_s3/other_s3_compatible' backup target details
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 access key
triliovault_s3_access_key: ''
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 secret key
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 secret key
triliovault_s3_secret_key: ''
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 region
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 region
## if your s3 does not have any region, just keep the parameter as it is
triliovault_s3_region_name: 'us-east-1'
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 bucket name
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 bucket name
triliovault_s3_bucket_name: ''
## Valid for 'ceph_s3' backup target only, provide S3 endpoint url
## Valid for 'other_s3_compatible' backup target only, provide S3 endpoint url
## This paramter is not valid for Amazon S3 backup target type, keep it as it is
triliovault_s3_endpoint_url: ''
## Valid for 'ceph_s3' backup target only, If SSL is enabled on S3 endpoint url then change it to 'True', otherwise keep it as 'False'
Expand Down
4 changes: 2 additions & 2 deletions kolla-ansible/ansible/roles/triliovault/templates/triliovault-datamover.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vault_s3_signature_version = {{ triliovault_s3_version }}
vault_s3_auth_version = {{ triliovault_s3_auth_version }}
vault_s3_ssl_cert =

{% elif triliovault_backup_target == "ceph_s3" %}
{% elif triliovault_backup_target == "other_s3_compatible" %}

vault_storage_type = s3
vault_storage_nfs_export = TrilioVault
Expand Down Expand Up @@ -62,7 +62,7 @@ keyring_ext = .{{ ceph_cinder_user }}.keyring
[contego_sys_admin]
helper_command = sudo /usr/bin/privsep-helper

{% if triliovault_backup_target == "ceph_s3" or triliovault_backup_target == "amazon_s3" %}
{% if triliovault_backup_target == "other_s3_compatible" or triliovault_backup_target == "amazon_s3" %}

[s3fuse_sys_admin]
helper_command = sudo /usr/bin/privsep-helper
Expand Down
4 changes: 2 additions & 2 deletions kolla-ansible/ansible/roles/triliovault/templates/triliovault-datamover.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
{% set triliovault_backup_target_type = 's3' if triliovault_backup_target in ['amazon_s3', 'ceph_s3'] else 'nfs' %}

{% set triliovault_backup_target_type = 's3' if triliovault_backup_target in ['amazon_s3', 'other_s3_compatible'] else 'nfs' %}
"command": "/opt/tvault/start_datamover_{{ triliovault_backup_target_type }}",
"config_files": [
{
Expand Down
30 changes: 19 additions & 11 deletions kolla-ansible/ansible/triliovault_globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ triliovault_horizon_image_full: "{{ triliovault_docker_registry }}/trilio/{{ kol

## Triliovault dmapi_workers count
## Default value of dmapi_workers is 2
## This parameter value used to spawn the number of dmapi processes to handle the incoming api requests.
## If your dmapi node has ‘n' cpu cores, It is recommended, to set this parameter to '4*n’.
## If dmapi_workers field is not present in config file. The Default value will be equals to number of cores present on the node
dmapi_workers: '2'

## TrilioVault's containers tag
Expand All @@ -28,7 +25,7 @@ triliovault_docker_registry: "docker.io"



## triliovault backup target possible values: 'nfs'/'amazon_s3'/'ceph_s3'
## triliovault backup target possible values: 'nfs'/'amazon_s3'/'other_s3_compatible'
triliovault_backup_target: 'nfs'

### 'NFS' backup target details
Expand All @@ -39,17 +36,17 @@ triliovault_nfs_shares: '192.168.122.101:/opt/tvault'
triliovault_nfs_options: 'nolock,soft,timeo=180,intr,lookupcache=none'


### 'amazon_s3/ceph_s3' backup target details
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 access key
### 'amazon_s3/other_s3_compatible' backup target details
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 access key
triliovault_s3_access_key: ''
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 secret key
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 secret key
triliovault_s3_secret_key: ''
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 region
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 region
## if your s3 does not have any region, just keep the parameter as it is
triliovault_s3_region_name: 'us-east-1'
## Valid for 'amazon_s3'/'ceph_s3' backup target, provide S3 bucket name
## Valid for 'amazon_s3'/'other_s3_compatible' backup target, provide S3 bucket name
triliovault_s3_bucket_name: ''
## Valid for 'ceph_s3' backup target only, provide S3 endpoint url
## Valid for 'other_s3_compatible' backup target only, provide S3 endpoint url
## This paramter is not valid for Amazon S3 backup target type, keep it as it is
triliovault_s3_endpoint_url: ''

Expand All @@ -59,7 +56,7 @@ triliovault_s3_version: 'default'
## S3 Auth version
triliovault_s3_auth_version: 'DEFAULT'

## Valid for 'ceph_s3' backup target only, If SSL is enabled on S3 endpoint url then change it to 'True', otherwise keep it as 'False'
## Valid for 'other_s3_compatible' backup target only, If SSL is enabled on S3 endpoint url then change it to 'True', otherwise keep it as 'False'
triliovault_s3_ssl_enabled: False
## Valid for 'ceph_s3' backup target only, if SSL is enabled on S3 endpoint URL and SSL certificates are self signed
# OR issued by a private authority then, user needs to copy the 'ceph s3 ca chain file' to "/etc/kolla/config/triliovault/"
Expand All @@ -71,3 +68,14 @@ triliovault_s3_ssl_cert_file_name: 's3-cert.pem'
## then, user needs to set this parameter value to: True , otherwise keep it's value as False.
## Type: Boolean
triliovault_copy_ceph_s3_ssl_cert: False

## Set haproxy timout for triliovault dmapi service
## these changes are reflected into the /etc/kolla/haproxy/haproxy.cfg
haproxy_http_request_timeout: '10m'
haproxy_queue_timeout: '10m'
haproxy_connect_timeout: '10m'
haproxy_client_timeout: '10m'
haproxy_server_timeout: '10m'
haproxy_check_timeout: '10m'
haproxy_defaults_balance: 'roundrobin'
haproxy_defaults_max_connections: '50000'