From fe87c23ce3450ff8519e9c7d62cb879903519069 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Sat, 15 Dec 2018 13:41:31 -0500
Subject: Attempting to fix NFS issues

Issues still persist where sometimes instances fail to start due to a
failure with os.utime to read the file path. This could be some bad race
condition between qemu/nova while copying images on the NFS. This patch
adds more ports to open in firewall, and changes initial directory owner
to nfsnobody.

Also, includes a patch to fix an apparent race condition when nova sends
a remote call to the privsep helper daemon to modify the time of the
base file owned by qemu:
https://review.openstack.org/#/c/625741/

Includes another fix for patching container images where the docker
image was not being detected correctly because the full gerrit project
name including 'openstack/' prefix was being used to search tripleo
docker images. Additionally, there were more bugs around patching
openstack python containers where the patch was not being applied
correctly.

JIRA: APEX-654

Change-Id: I1d011035486298d5906038922e69d478c383c3f7
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit e1d286e89e04577bda2569a5909dfe8182d953ba)
---
 .../playbooks/prepare_overcloud_containers.yml       | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'lib/ansible/playbooks/prepare_overcloud_containers.yml')

diff --git a/lib/ansible/playbooks/prepare_overcloud_containers.yml b/lib/ansible/playbooks/prepare_overcloud_containers.yml
index 54dbe098..45ca3011 100644
--- a/lib/ansible/playbooks/prepare_overcloud_containers.yml
+++ b/lib/ansible/playbooks/prepare_overcloud_containers.yml
@@ -42,6 +42,15 @@
       become: yes
       become_user: stack
       when: sdn != false
+    - name: Touch sdn-images file when nosdn
+      copy:
+        content: ""
+        dest: /home/stack/sdn-images.yaml
+        force: no
+        group: stack
+        owner: stack
+        mode: 0644
+      when: sdn == false
     - name: Update Ceph tag for aarch64 in container env file
       lineinfile:
         path: /home/stack/overcloud_containers.yml
@@ -68,14 +77,13 @@
         url: http://{{ undercloud_ip }}:8787/v2/_catalog
         body_format: json
       register: response
-    - name: Patch Docker images
-      shell: >
-        cd /home/stack/containers/{{ item }} && docker build
-        -t {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex .
+    - include_tasks: patch_containers.yml
+      with_items: "{{ patched_docker_services }}"
+      loop_control:
+        loop_var: item
       when:
         - patched_docker_services|length > 0
         - item in (response.json)['repositories']|join(" ")
-      with_items: "{{ patched_docker_services }}"
     - name: Push patched docker images to local registry
       shell: docker push {{ undercloud_ip }}:8787/tripleo{{ os_version }}/centos-binary-{{ item }}:apex
       when:
@@ -89,4 +97,4 @@
         replace: '\1:apex'
       with_nested:
         - [ '/home/stack/sdn-images.yaml', '/home/stack/docker-images.yaml']
-        - "{{ patched_docker_services }}"
\ No newline at end of file
+        - "{{ patched_docker_services }}"
-- 
cgit 1.2.3-korg