From 24f5a255c954a94d69768b139a113113d4e37c80 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 23 Aug 2018 12:28:46 -0400
Subject: [PATCH] Create missing directories before mounting them

When deploying with podman, we need to create directories if they don't
exist before trying to mount them later when containers are starting.
Otherwise, podman fails with this kind of error:
error checking path \"/etc/iscsi\": stat /etc/iscsi: no such file or directory"

Change-Id: I7dbdc7f3646dda99c8014b4c8ca2edd48778b392
---
 docker/services/glance-api.yaml       | 4 ++++
 docker/services/iscsid.yaml           | 4 ++++
 docker/services/mistral-executor.yaml | 4 ++++
 docker/services/swift-storage.yaml    | 1 +
 4 files changed, 13 insertions(+)

diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml
index 2c8c255e9c..96d66176b9 100644
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@@ -230,6 +230,10 @@ outputs:
             file:
               path: /etc/ceph
               state: directory
+          - name: ensure /var/lib/glance exists
+            file:
+              path: /var/lib/glance
+              state: directory
       upgrade_tasks:
         - when: step|int == 0
           tags: common
diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index f430088225..a44965b3a5 100644
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -105,6 +105,10 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
+        - name: ensure /etc/iscsi exists
+          file:
+            path: /etc/iscsi
+            state: directory
         - name: stat /lib/systemd/system/iscsid.socket
           stat: path=/lib/systemd/system/iscsid.socket
           register: stat_iscsid_socket
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 3d01bc5ad3..4d818e981c 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -132,6 +132,10 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
+        - name: create /var/lib/mistral directory
+          file:
+            path: /var/lib/mistral
+            state: directory
         - name: create persistent logs directory
           file:
             path: /var/log/containers/mistral
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index bc567b5e1e..a64a5371c0 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -446,6 +446,7 @@ outputs:
             state: directory
           with_items:
             - /srv/node
+            - /var/cache/swift
             - /var/log/swift
             - /var/log/containers
         - name: Set swift_use_local_disks fact