aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-17 18:19:59 +0000
committerGerrit Code Review <review@openstack.org>2016-10-17 18:19:59 +0000
commitb84585524eddc5aea0510294b94b04f2f38da839 (patch)
tree6843497ee4b253665d79925e506246b983bb5d9b
parent81e20c72912f18a8a35c3fa975d3b6202574abf1 (diff)
parent032234bad63fa4b9f8c04d31d1be26d97086a0fa (diff)
downloadkolla-b84585524eddc5aea0510294b94b04f2f38da839.tar.gz
kolla-b84585524eddc5aea0510294b94b04f2f38da839.zip
Merge "Fix cinder upgrade permission issue"
-rw-r--r--ansible/roles/cinder/templates/cinder-api.json.j212
-rw-r--r--ansible/roles/cinder/templates/cinder-backup.json.j212
-rw-r--r--ansible/roles/cinder/templates/cinder-scheduler.json.j212
-rw-r--r--ansible/roles/cinder/templates/cinder-volume.json.j212
4 files changed, 48 insertions, 0 deletions
diff --git a/ansible/roles/cinder/templates/cinder-api.json.j2 b/ansible/roles/cinder/templates/cinder-api.json.j2
index 7ffaf6fca..04b916981 100644
--- a/ansible/roles/cinder/templates/cinder-api.json.j2
+++ b/ansible/roles/cinder/templates/cinder-api.json.j2
@@ -7,5 +7,17 @@
"owner": "cinder",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/lib/cinder",
+ "owner: "cinder:cinder",
+ "recurse": true
+ },
+ {
+ "path": "/var/log/kolla/cinder",
+ "owner": "cinder:cinder",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/cinder/templates/cinder-backup.json.j2 b/ansible/roles/cinder/templates/cinder-backup.json.j2
index fefb9d9c5..d42428ac1 100644
--- a/ansible/roles/cinder/templates/cinder-backup.json.j2
+++ b/ansible/roles/cinder/templates/cinder-backup.json.j2
@@ -14,5 +14,17 @@
"perm": "0700",
"optional": {{ (not cinder_backend_ceph | bool) | string | lower }}
}{% endif %}
+ ],
+ "permissions": [
+ {
+ "path": "/var/lib/cinder",
+ "owner": "cinder:cinder",
+ "recurse": true
+ },
+ {
+ "path": "/var/log/kolla/cinder",
+ "owner": "cinder:cinder",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/cinder/templates/cinder-scheduler.json.j2 b/ansible/roles/cinder/templates/cinder-scheduler.json.j2
index 89f521d5a..b5ef7b548 100644
--- a/ansible/roles/cinder/templates/cinder-scheduler.json.j2
+++ b/ansible/roles/cinder/templates/cinder-scheduler.json.j2
@@ -7,5 +7,17 @@
"owner": "cinder",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/lib/cinder",
+ "owner": "cinder:cinder",
+ "recurse": true
+ },
+ {
+ "path": "/var/log/kolla/cinder",
+ "owner": "cinder:cinder",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/cinder/templates/cinder-volume.json.j2 b/ansible/roles/cinder/templates/cinder-volume.json.j2
index e82912ad0..db3891119 100644
--- a/ansible/roles/cinder/templates/cinder-volume.json.j2
+++ b/ansible/roles/cinder/templates/cinder-volume.json.j2
@@ -19,5 +19,17 @@
"owner": "cinder",
"perm": "0600"
}{% endif %}
+ ],
+ "permissions": [
+ {
+ "path": "/var/lib/cinder",
+ "owner": "cinder:cinder",
+ "recurse": true
+ },
+ {
+ "path": "/var/log/kolla/cinder",
+ "owner": "cinder:cinder",
+ "recurse": true
+ }
]
}