aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-20 11:29:15 +0000
committerGerrit Code Review <review@openstack.org>2016-10-20 11:29:16 +0000
commit68e1f00ab2d7677536255b0d9822b0cfc4f5deea (patch)
tree670a7706ad2a7c38cff4d851d225ff887307695a
parenta64f88168e39adb6677dd485f03113c5011a970e (diff)
parentb11504d4e1ac2e787e8015d7ccca1cb2f1aa7325 (diff)
downloadkolla-68e1f00ab2d7677536255b0d9822b0cfc4f5deea.tar.gz
kolla-68e1f00ab2d7677536255b0d9822b0cfc4f5deea.zip
Merge "Fix invalid json in ironic service"
-rw-r--r--ansible/roles/ironic/templates/ironic-api.json.j22
-rw-r--r--ansible/roles/ironic/templates/ironic-conductor.json.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/ironic/templates/ironic-api.json.j2 b/ansible/roles/ironic/templates/ironic-api.json.j2
index d9b650dd8..bf10f3105 100644
--- a/ansible/roles/ironic/templates/ironic-api.json.j2
+++ b/ansible/roles/ironic/templates/ironic-api.json.j2
@@ -10,7 +10,7 @@
],
"permissions": [
{
- "path": "/var/log/kolla/ironic"
+ "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 1118c5d24..46aa5ed6b 100644
--- a/ansible/roles/ironic/templates/ironic-conductor.json.j2
+++ b/ansible/roles/ironic/templates/ironic-conductor.json.j2
@@ -20,7 +20,7 @@
"recurse": true
},
{
- "path": "/tftpboot"
+ "path": "/tftpboot",
"owner": "ironic:ironic",
"recurse": true
}