summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <m.pilat@partner.samsung.com>2019-05-31 14:03:05 +0200
committerroot <m.pilat@partner.samsung.com>2019-06-04 10:48:19 +0200
commitb4110df1efc1bf1af9e85d3309a59dec2f03cba2 (patch)
tree0fe62894220caa534771c816b5b9688ac35fa820
parentf45f73f749fffb301d825ec53fae2878c505980d (diff)
Adapting to Dublin realase
In Dublin: First project has taken ownership of own helm charts, oom repository must be obtained with subrepositories. By default no applications are enabled, introducing a way to submit more override files in to installer Issue-ID: OOM-1861 Signed-off-by: root <m.pilat@partner.samsung.com> Change-Id: I1724de6b87bd0e9d17df4d0f55615a3f1c439d40
-rw-r--r--ansible/roles/application/defaults/main.yml2
-rw-r--r--ansible/roles/application/tasks/install.yml2
-rwxr-xr-xbuild/fetch_and_patch_charts.sh2
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}"