summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/ands_kaas/tasks/search.yml2
-rw-r--r--roles/ands_kaas/templates/50-kaas-pods.yml.j213
2 files changed, 12 insertions, 3 deletions
diff --git a/roles/ands_kaas/tasks/search.yml b/roles/ands_kaas/tasks/search.yml
index e54c42b..9844ee8 100644
--- a/roles/ands_kaas/tasks/search.yml
+++ b/roles/ands_kaas/tasks/search.yml
@@ -12,5 +12,5 @@
local_path: "{{ osv_path }}"
remote_path: "{{ hostvars[inventory_hostname][pvar] }}"
when:
- - osv in kaas_openshift_volumes
+ - osv in (kaas_project_config.volumes | default(kaas_openshift_volumes))
- hostvars[inventory_hostname][pvar] is defined
diff --git a/roles/ands_kaas/templates/50-kaas-pods.yml.j2 b/roles/ands_kaas/templates/50-kaas-pods.yml.j2
index 49dab3f..9782f75 100644
--- a/roles/ands_kaas/templates/50-kaas-pods.yml.j2
+++ b/roles/ands_kaas/templates/50-kaas-pods.yml.j2
@@ -183,8 +183,9 @@ objects:
{{ type }}:
timeoutSeconds: {{ probe.timeout | default(1) }}
initialDelaySeconds: {{ probe.delay | default(10) }}
- {% if (probe.cmd is defined) %}
- command: "{{ probe.cmd }}"
+ {% if (probe.command is defined) %}
+ exec:
+ command: {{ probe.command | to_json }}
{% elif (probe.path is defined) %}
httpGet:
path: {{ probe.path }}
@@ -196,5 +197,13 @@ objects:
{% endfor %}
{% endfor %}
{% endif %}
+ {% if img.hooks is defined %}
+ lifecycle:
+ {% for hook in img.hooks %}
+ {{ hook.type }}:
+ exec:
+ command: {{ hook.command | to_json }}
+ {% endfor %}
+ {% endif %}
{% endfor %}
{% endfor %}