[feature] Patch ansible/awx_task image to side-step AWX #6692

Applying the `--blocking-io` suggestion from ansible/awx#6692 results in six consecutive successful runs in the conditions described inside the bug report: https://awx-poc-vpsi.epfl.ch/#/jobs/playbook/817 https://awx-poc-vpsi.epfl.ch/#/jobs/playbook/820 https://awx-poc-vpsi.epfl.ch/#/jobs/playbook/823 https://awx-poc-vpsi.epfl.ch/#/jobs/playbook/826 https://awx-poc-vpsi.epfl.ch/#/jobs/playbook/828 https://awx-poc-vpsi.epfl.ch/#/jobs/playbook/829
epfl-si · Apr 16, 2020 · 551cf9f · 551cf9f
1 parent 41f20c4
commit 551cf9f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/ansible/roles/awx-instance/tasks/k8s-builds.yml b/ansible/roles/awx-instance/tasks/k8s-builds.yml
@@ -30,3 +30,23 @@
   when: _awx_runner_buildconfig is changed
   shell: "oc -n {{ awx_mgmt_build_namespace }} start-build {{ awx_runner_image_name }}"
   delegate_to: localhost
+
+- name: "Patch {{ awx_task_base_image_fullname }} into {{ awx_task_image_name }}"
+  register: _awx_task_buildconfig
+  openshift_imagestream:
+    tag: "{{ awx_version }}"
+    metadata:
+      name: "{{ awx_task_image_name }}"
+      namespace: "{{ ansible_oc_namespace }}"
+    dockerfile: |
+       FROM {{ awx_task_base_image_fullname }}
+
+       # https://github.com/ansible/awx/issues/6692#issuecomment-613451838
+       USER 0
+       RUN set -e -x; for playbook in /var/lib/awx/venv/awx/lib/python3.6/site-packages/awx/playbooks/*_isolated.yml; do sed -i '/rsync_opts:/a \ \ \ \ \ \ \ \ \ \ -\ "--blocking-io"' $playbook; done
+       USER 1000
+
+- name: "Rebuild {{ awx_task_image_name }} now"
+  when: _awx_task_buildconfig is changed
+  shell: "oc -n {{ awx_mgmt_build_namespace }} start-build {{ awx_task_image_name }}"
+  delegate_to: localhost
diff --git a/ansible/roles/awx-instance/tasks/k8s.yml b/ansible/roles/awx-instance/tasks/k8s.yml
@@ -115,7 +115,7 @@
               mountPath: "/var/run/memcached"
           #####################################################
           - name: awx-task
-            image: "ansible/awx_task:{{ awx_version }}"
+            image: docker-registry.default.svc:5000/{{ ansible_oc_namespace }}/{{ awx_task_image_name }}:{{ awx_version }}
             command:
             - /usr/bin/launch_awx_task.sh
             resources:

diff --git a/ansible/roles/awx-instance/vars/k8s-vars.yml b/ansible/roles/awx-instance/vars/k8s-vars.yml
@@ -8,6 +8,9 @@ awx_runner_base_image_name: ansible-runner
 awx_runner_base_image_fullname: docker.io/ansible/ansible-runner:latest
 awx_runner_image_name: "wp-ansible-runner"
 
+awx_task_base_image_fullname: "docker.io/ansible/awx_task:{{ awx_version }}"
+awx_task_image_name: "wp-awx-task"
+
 awx_wpveritas_inventory: "{{ awx_wpveritas_inventories[ansible_oc_namespace] }}"
 awx_wpveritas_inventories:
   wwp: prod