diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-01-29 11:45:55 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-02-04 08:15:51 +0000 |
| commit | c6ac1c3b4ba655b950dde7457be706b744d707d6 (patch) | |
| tree | 2aa129a88694ee36bce5bf57ef807126d84f40f9 | |
| parent | 14e400e35052b953e217145ae7d20151bcb05f04 (diff) | |
Fix Helm v3 data dir setup
Verifier test is also added to ensure correct plugin deployment.
Change-Id: I2e43d942f39fc7ecfe34c22d84ba0f59978ec225
Issue-ID: OOM-2665
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
| -rw-r--r-- | ansible/roles/application/molecule/default/tests/test_default.py | 4 | ||||
| -rw-r--r-- | ansible/roles/application/tasks/install-helm3-plugins.yml | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ansible/roles/application/molecule/default/tests/test_default.py b/ansible/roles/application/molecule/default/tests/test_default.py index 1bf36247..be9b4cdf 100644 --- a/ansible/roles/application/molecule/default/tests/test_default.py +++ b/ansible/roles/application/molecule/default/tests/test_default.py @@ -21,6 +21,7 @@ deploy moleculetestapp local/moleculetestapp --namespace \ moleculetestapp -f /opt/moleculetestapp/helm_charts/onap/resources/\ overrides/onap-all.yaml -f /opt/moleculetestapp/override.yaml \ --timeout 1800""" + expected_plugin_path = '/plugins/deploy/deploy.sh' elif helm_release == 'v3': expected_content = """env repo list @@ -29,7 +30,10 @@ deploy moleculetestapp local/moleculetestapp --namespace \ moleculetestapp -f /opt/moleculetestapp/helm_charts/onap/resources/\ overrides/onap-all.yaml -f /opt/moleculetestapp/override.yaml \ --timeout 1800""" + expected_plugin_path = '/root/.local/share/helm/plugins/deploy/' +\ + 'deploy.sh' assert fc == expected_content + assert host.file(expected_plugin_path).exists def test_helm_override_file(host): diff --git a/ansible/roles/application/tasks/install-helm3-plugins.yml b/ansible/roles/application/tasks/install-helm3-plugins.yml index da402f31..5d933ed2 100644 --- a/ansible/roles/application/tasks/install-helm3-plugins.yml +++ b/ansible/roles/application/tasks/install-helm3-plugins.yml @@ -6,12 +6,12 @@ register: helm_env - name: Set helm data dir set_fact: - helm_data_dir: | - "{% if 'HELM_DATA_HOME' in helm_env.stdout %} + helm_data_dir: + "{% if 'HELM_DATA_HOME' in helm_env.stdout -%} {{ (helm_env.stdout | replace('\"', '') | regex_search('HELM_DATA_HOME.*')).split('=')[1] }} - {% else %} + {%- else -%} {{ '~/.local/share/helm' }} - {% endif %}" + {%- endif %}" - name: Ensure that dir for helm plugins exists file: path: "{{ helm_data_dir }}/plugins" |