From 1a57ab0343825ab5446761adffbf6ea86d8df284 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 17 Oct 2016 14:28:06 +0800
Subject: [PATCH] Fix ironic upgrade permission issue

Change-Id: I8af7c842e9b0afdc035bb64d3350f6ad65682377
Partial-Bug: #1631503
---
 .../roles/ironic/templates/ironic-api.json.j2   |  7 +++++++
 .../ironic/templates/ironic-conductor.json.j2   | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/ansible/roles/ironic/templates/ironic-api.json.j2 b/ansible/roles/ironic/templates/ironic-api.json.j2
index 621f0e29d4..d9b650dd88 100644
--- a/ansible/roles/ironic/templates/ironic-api.json.j2
+++ b/ansible/roles/ironic/templates/ironic-api.json.j2
@@ -7,5 +7,12 @@
             "owner": "ironic",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ironic"
+            "owner": "ironic:ironic",
+            "recurse": true
+        }
     ]
 }
diff --git a/ansible/roles/ironic/templates/ironic-conductor.json.j2 b/ansible/roles/ironic/templates/ironic-conductor.json.j2
index 68e5596f68..1118c5d246 100644
--- a/ansible/roles/ironic/templates/ironic-conductor.json.j2
+++ b/ansible/roles/ironic/templates/ironic-conductor.json.j2
@@ -7,5 +7,22 @@
             "owner": "ironic",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ironic",
+            "owner": "ironic:ironic",
+            "recurse": true
+        },
+        {
+            "path": "/var/lib/ironic",
+            "owner": "ironic:ironic",
+            "recurse": true
+        },
+        {
+            "path": "/tftpboot"
+            "owner": "ironic:ironic",
+            "recurse": true
+        }
     ]
 }