From ec8a0d18b61d884863701acbb25ad1439b1d4ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Wed, 23 Aug 2017 10:48:23 +0200 Subject: [PATCH] see #13, add a fix for the subPath bug of OCP 3.6 --- roles/3scale/tasks/patch_apicast.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/3scale/tasks/patch_apicast.yml b/roles/3scale/tasks/patch_apicast.yml index ecd0c28..bd96999 100644 --- a/roles/3scale/tasks/patch_apicast.yml +++ b/roles/3scale/tasks/patch_apicast.yml @@ -20,12 +20,14 @@ register: patched changed_when: false + # TODO: Temporary fix for https://bugzilla.redhat.com/show_bug.cgi?id=1481617. Remove as soon as the bug is fixed (see #13) ! - name: Patch volume 'apicast-cors' - command: 'oc patch dc/{{ item }} -n {{ threescale_project }} --type=json -p ''[ {"op": "add", "path": "/spec/template/spec/containers/0/volumeMounts/0/subPath", "value":"apicast_cors.lua"} ]'' ' + command: 'oc patch dc/{{ item }} -n {{ threescale_project }} --type=json -p ''[ {"op": "add", "path": "/spec/template/spec/containers/0/volumeMounts/0/subPath", "value":"..data/apicast_cors.lua"} ]'' ' when: "'apicast-cors' not in patched.stdout_lines" + # TODO: Temporary fix for https://bugzilla.redhat.com/show_bug.cgi?id=1481617. Remove as soon as the bug is fixed (see #13) ! - name: Patch volume 'cors-conf' - command: 'oc patch dc/{{ item }} -n {{ threescale_project }} --type=json -p ''[ {"op": "add", "path": "/spec/template/spec/containers/0/volumeMounts/1/subPath", "value":"cors.conf"} ]'' ' + command: 'oc patch dc/{{ item }} -n {{ threescale_project }} --type=json -p ''[ {"op": "add", "path": "/spec/template/spec/containers/0/volumeMounts/1/subPath", "value":"..data/cors.conf"} ]'' ' when: "'cors-conf' not in patched.stdout_lines" - name: Add environment variable APICAST_MODULE to the APICast DeploymentConfig