From 71f6d104d8a407cfcbdaad42be0f33ecd78b950c Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Fri, 16 Dec 2016 22:30:36 +0800
Subject: [PATCH] Add Loading nfs_shares file without .j2 extension in cinder
config
We do not use *.j2 filename pattern in custom config folder. Add
nfs_shares without .j2 extension for consistency. And do not remove the
.j2 extension file for back compatibility.
Change-Id: Ic66c2f3188e818b9dff4d693102f0d433d2695ac
---
ansible/roles/cinder/tasks/config.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml
index b64164ba84..97fe8e36a3 100644
--- a/ansible/roles/cinder/tasks/config.yml
+++ b/ansible/roles/cinder/tasks/config.yml
@@ -77,6 +77,10 @@
- "{{ node_custom_config }}/cinder/nfs_shares.j2"
- "{{ node_custom_config }}/cinder/cinder-volume/nfs_shares.j2"
- "{{ node_custom_config }}/cinder/{{ inventory_hostname }}/nfs_shares.j2"
+ - "{{ node_custom_config }}/nfs_shares"
+ - "{{ node_custom_config }}/cinder/nfs_shares"
+ - "{{ node_custom_config }}/cinder/cinder-volume/nfs_shares"
+ - "{{ node_custom_config }}/cinder/{{ inventory_hostname }}/nfs_shares"
skip: "{{ not enable_cinder_backend_nfs | bool and not enable_cinder_backend_hnas_nfs | bool }}"
- name: Check cinder containers