summaryrefslogtreecommitdiffstats
path: root/ansible/roles/application/defaults
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-02-08 13:48:06 +0100
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2021-02-09 08:33:42 +0000
commit3e8ac4b4ca407f5185dfa4becc22f56dc750afe7 (patch)
tree880b06f9d0cc66f277712dc8b30eb8445fdc7d99 /ansible/roles/application/defaults
parent77324013ff407183b0d9729bd335d8bf3cc72b79 (diff)
Customize helm "--timeout" option format if running helm v3
Helm v3 requires unit definition for 'timeout' option which is not supported by Helm v2. Change-Id: Ia5839e5c412be1700459c70d43d2e6cc0400633d Issue-ID: OOM-2665 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible/roles/application/defaults')
-rw-r--r--ansible/roles/application/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/application/defaults/main.yml b/ansible/roles/application/defaults/main.yml
index 6a7472a6..8e630f73 100644
--- a/ansible/roles/application/defaults/main.yml
+++ b/ansible/roles/application/defaults/main.yml
@@ -2,7 +2,7 @@
helm_repository_name: local
helm_repository_url: http://127.0.0.1:8879
helm_extra_install_options:
- - { opt: '--timeout 1800'}
+ - { opt: "{% if helm_version | regex_search('^v3' ) %}{{ '--timeout 1800s' }}{% else %}{{ '--timeout 1800' }}{% endif %}"}
# Override file generation for Helm application can be customized by any role
# given by user and found by ansible from roles_path.
# By default override file is generated by 'application-override' role that