From 953433ce7bb9ed62a14f6a9f4178f8bcba30c5a9 Mon Sep 17 00:00:00 2001
From: Pierre Blanc <pierreblanc75@gmail.com>
Date: Wed, 20 Dec 2017 10:22:51 -0500
Subject: [PATCH] Remove duplicate configuration options on trove templates

The option neutron_endpoint_type is duplicate on these files:
 - trove/templates/trove.conf.j2
 - trove/templates/trove-taskmanager.conf.j2

We just have to remove one occurrence.

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

diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index 989c9c9809..3f35dc3e1c 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -14,7 +14,6 @@ trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone
 
 nova_compute_endpoint_type = internalURL
 neutron_endpoint_type = internalURL
-neutron_endpoint_type = internalURL
 swift_endpoint_type = internalURL
 glance_endpoint_type = internalURL
 trove_endpoint_type = internalURL
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index c7c27cfb02..500c638ac9 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -16,7 +16,6 @@ trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone
 
 nova_compute_endpoint_type = internalURL
 neutron_endpoint_type = internalURL
-neutron_endpoint_type = internalURL
 swift_endpoint_type = internalURL
 glance_endpoint_type = internalURL
 trove_endpoint_type = internalURL