From 3660c77637aa431afc92b1f1d7dfea34eaebfe1a Mon Sep 17 00:00:00 2001
From: likui <likui@yovole.com>
Date: Thu, 23 Jul 2020 09:01:11 +0800
Subject: [PATCH] Remove deprecated options in Trove

Option "network_label_regex" from group "DEFAULT" is
deprecated for removal.

Change-Id: I8aab2ca322159e61e4cbe9a5b30825a71a991e7e
---
 ansible/roles/trove/templates/trove-taskmanager.conf.j2 | 2 --
 ansible/roles/trove/templates/trove.conf.j2             | 2 --
 2 files changed, 4 deletions(-)

diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index 761433b479..5c64fb4405 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -24,8 +24,6 @@ trove_endpoint_type = internalURL
 
 network_driver = trove.network.neutron.NeutronDriver
 
-network_label_regex = .*
-
 [service_credentials]
 auth_url = {{ keystone_internal_url }}/v3
 region_name = {{ openstack_region_name }}
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index 99f3eeea1d..95b0fde511 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -21,8 +21,6 @@ trove_endpoint_type = internalURL
 
 network_driver = trove.network.neutron.NeutronDriver
 
-network_label_regex = .*
-
 [service_credentials]
 auth_url = {{ keystone_internal_url }}/v3
 region_name = {{ openstack_region_name }}