From 5d5ae0802ef4d36f43de37af0d3ec1b483f7c284 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@navercorp.com>
Date: Wed, 4 Apr 2018 14:53:01 +0900
Subject: [PATCH] Modify permissions on ceph file in manila

Modify the permissions and owner of the ceph configuration file to be
consistent with other manila configuration files.

Change-Id: I9039196a1b26d74b313a02707dce8732a5e187cb
---
 ansible/roles/manila/tasks/ceph.yml          | 3 +++
 ansible/roles/manila/tasks/external_ceph.yml | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/ansible/roles/manila/tasks/ceph.yml b/ansible/roles/manila/tasks/ceph.yml
index 994b723b13..497dff917e 100644
--- a/ansible/roles/manila/tasks/ceph.yml
+++ b/ansible/roles/manila/tasks/ceph.yml
@@ -11,6 +11,8 @@
       - "{{ node_custom_config }}/ceph.conf"
       - "{{ node_custom_config }}/ceph/{{ inventory_hostname }}/ceph.conf"
     dest: "{{ node_config_directory }}/manila-share/ceph.conf"
+    mode: "0660"
+  become: true
 
 - name: Pulling cephx keyring for manila
   command: docker exec ceph_mon ceph auth get-or-create client.manila mon 'allow r, allow command "auth del", allow command "auth caps", allow command "auth get", allow command "auth get-or-create"' osd 'allow rw' mds 'allow *'
@@ -24,3 +26,4 @@
     content: "{{ cephx_key_manila.stdout }}\n\r"
     dest: "{{ node_config_directory }}/manila-share/ceph.client.manila.keyring"
     mode: "0600"
+  become: true
diff --git a/ansible/roles/manila/tasks/external_ceph.yml b/ansible/roles/manila/tasks/external_ceph.yml
index f58b3ffa48..1ab0aec387 100644
--- a/ansible/roles/manila/tasks/external_ceph.yml
+++ b/ansible/roles/manila/tasks/external_ceph.yml
@@ -12,6 +12,8 @@
       - "{{ node_custom_config }}/manila/ceph.conf"
       - "{{ node_custom_config }}/manila/manila-share/ceph.conf"
     dest: "{{ node_config_directory }}/manila-share/ceph.conf"
+    mode: "0660"
+  become: true
   when:
     - inventory_hostname in groups['manila-share']
   notify:
@@ -21,6 +23,8 @@
   copy:
     src: "{{ item }}"
     dest: "{{ node_config_directory }}/manila-share/"
+    mode: "0600"
+  become: true
   with_fileglob:
     - "{{ node_custom_config }}/manila/ceph.client.manila.keyring"
     - "{{ node_custom_config }}/manila/manila/ceph.client.manila.keyring"