From 36c3e3c5ecf01d87bd1f658018e83f9f8cf4a6db Mon Sep 17 00:00:00 2001
From: LinPeiWen <591171850@qq.com>
Date: Mon, 23 Nov 2020 06:05:48 +0000
Subject: [PATCH] Delete the default parameters of the gluster NFS driver

The two parameters "manila_glusterfs_volume_pattern"
and "manila_glusterfs_mount_point_base" do not require default

Change-Id: I58e7cdf1193900be54c136caabe6e41cedf5a932
---
 ansible/roles/manila/defaults/main.yml | 2 --
 etc/kolla/globals.yml                  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml
index aa25523f26..aa8c3f7fad 100644
--- a/ansible/roles/manila/defaults/main.yml
+++ b/ansible/roles/manila/defaults/main.yml
@@ -225,5 +225,3 @@ manila_ks_users:
 ####################
 manila_glusterfs_share_layout: "layout_volume.GlusterfsVolumeMappedLayout"
 manila_glusterfs_nfs_server_type: "Gluster"
-manila_glusterfs_volume_pattern: "manila-share-volume-\\d+$"
-manila_glusterfs_mount_point_base: "$state_path/mnt"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 72371eab88..932a1c03bf 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -618,7 +618,7 @@
 #manila_glusterfs_ssh_user:
 #manila_glusterfs_ssh_password:
 # Used to filter GlusterFS volumes for share creation.
-# Examples: manila-share-volume-\d+$, manila-share-volume-#{size}G-\d+$;
+# Examples: manila-share-volume-\\d+$, manila-share-volume-#{size}G-\\d+$;
 #manila_glusterfs_volume_pattern:
 
 # Directory layout Options