diff options
| author |   Michal Zegan <m.zegan@samsung.com> | 2019-06-05 09:05:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-05 09:05:05 +0000 |
| commit | be3df7facde9edca0b64226e541e21e945bf5da1 (patch) | |
| tree | 0bdd18b7605af2f9ecb194b0698a2fd6939193d7 | |
| parent | 2a50615f814c28dd78e30b5b40e4636d4f6b7dfd (diff) | |
| parent | b4110df1efc1bf1af9e85d3309a59dec2f03cba2 (diff) | |
Merge "Adapting to Dublin realase"
| -rw-r--r-- | ansible/roles/application/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/application/tasks/install.yml | 2 | ||||
| -rwxr-xr-x | build/fetch_and_patch_charts.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/ansible/roles/application/defaults/main.yml b/ansible/roles/application/defaults/main.yml index 84fffeca..2ae668ac 100644 --- a/ansible/roles/application/defaults/main.yml +++ b/ansible/roles/application/defaults/main.yml @@ -11,3 +11,5 @@ helm_extra_install_options: app_skip_helm_override: false app_helm_override_role: application-override app_helm_override_file: "{{ app_data_path }}/override.yaml" +helm_overide_files: + - "{{ app_helm_override_file }}" diff --git a/ansible/roles/application/tasks/install.yml b/ansible/roles/application/tasks/install.yml index bdf6e511..003631d7 100644 --- a/ansible/roles/application/tasks/install.yml +++ b/ansible/roles/application/tasks/install.yml @@ -71,7 +71,7 @@ {{ app_helm_release_name }} {{ helm_repository_name }}/{{ app_helm_chart_name }} --namespace {{ app_kubernetes_namespace }} - {{ '' if app_skip_helm_override else '-f ' + app_helm_override_file }} + {% if not app_skip_helm_override %} {% for arg in helm_overide_files %} {{ '-f ' + arg }} {% endfor %} {% endif %} {% for arg in helm_extra_install_options %} {{ arg.opt }} {% endfor %} changed_when: true # when executed its a changed type of action register: helm_install diff --git a/build/fetch_and_patch_charts.sh b/build/fetch_and_patch_charts.sh index 79d7a01e..22d45e66 100755 --- a/build/fetch_and_patch_charts.sh +++ b/build/fetch_and_patch_charts.sh @@ -54,7 +54,7 @@ TOTAL=5 PATCH_FILE=$(realpath "${3}") echo -e "${_G}[Step $((CURR++))/${TOTAL} cloning repo with charts to be patched]${C_}" -git clone "${1}" "${4}" +git clone --recurse-submodules "${1}" "${4}" echo -e "${_G}[Step $((CURR++))/${TOTAL} setting working dir to ${4}]${C_}" pushd "${4}" |