From 3c312a4d9ea36fa0df18f60d3eea617f37ae9c25 Mon Sep 17 00:00:00 2001
From: "wu.chunyang" <wuchunyang@yovole.com>
Date: Tue, 18 Aug 2020 22:15:36 +0800
Subject: [PATCH] remove obsolete configurations

remove cluster_interface from project.
update storage_interface docs.and remove
storage_interface_address variable

Change-Id: I3f811db988234f94b5ed0cc9d24233f70784f58d
---
 ansible/group_vars/all.yml                         |  5 -----
 doc/source/admin/production-architecture-guide.rst | 12 +++---------
 etc/kolla/globals.yml                              |  2 --
 tools/validate-all-file.py                         |  2 --
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 589f3aa792..1f91043dbf 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -66,9 +66,6 @@ container_proxy:
 # to the api_interface.  Allow the bind address to be an override.
 api_interface_address: "{{ 'api' | kolla_address }}"
 
-# This is used to get the ip corresponding to the storage_interface.
-storage_interface_address: "{{ 'storage' | kolla_address }}"
-
 ################
 # Chrony options
 ################
@@ -199,7 +196,6 @@ neutron_external_interface: "eth1"
 kolla_external_vip_interface: "{{ network_interface }}"
 api_interface: "{{ network_interface }}"
 storage_interface: "{{ network_interface }}"
-cluster_interface: "{{ network_interface }}"
 swift_storage_interface: "{{ storage_interface }}"
 swift_replication_interface: "{{ swift_storage_interface }}"
 migration_interface: "{{ api_interface }}"
@@ -213,7 +209,6 @@ dns_interface: "{{ network_interface }}"
 network_address_family: "ipv4"
 api_address_family: "{{ network_address_family }}"
 storage_address_family: "{{ network_address_family }}"
-cluster_address_family: "{{ network_address_family }}"
 swift_storage_address_family: "{{ storage_address_family }}"
 swift_replication_address_family: "{{ swift_storage_address_family }}"
 migration_address_family: "{{ api_address_family }}"
diff --git a/doc/source/admin/production-architecture-guide.rst b/doc/source/admin/production-architecture-guide.rst
index 4cc858011e..1e33263ad0 100644
--- a/doc/source/admin/production-architecture-guide.rst
+++ b/doc/source/admin/production-architecture-guide.rst
@@ -54,15 +54,9 @@ In Kolla operators should configure following network interfaces:
   ``kolla_enable_tls_external`` is set to yes. Defaults to
   ``network_interface``.
 
-* ``storage_interface`` - This is the interface that is used by virtual
-  machines to communicate to Ceph. This can be heavily utilized so it's
-  recommended to use a high speed network fabric. Defaults to
-  ``network_interface``.
-
-* ``cluster_interface`` - This is another interface used by Ceph. It's used for
-  data replication. It can be heavily utilized also and if it becomes a
-  bottleneck it can affect data consistency and performance of whole cluster.
-  Defaults to ``network_interface``.
+* ``storage_interface`` - This is the interface that is used by Swift.
+  This can be heavily utilized so it's recommended to use a high speed
+  network fabric. Defaults to ``network_interface``.
 
 * ``swift_storage_interface`` - This interface is used by Swift for storage
   access traffic.  This can be heavily utilized so it's recommended to use
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 6b56b6e73a..34c2ae69eb 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -104,7 +104,6 @@
 #kolla_external_vip_interface: "{{ network_interface }}"
 #api_interface: "{{ network_interface }}"
 #storage_interface: "{{ network_interface }}"
-#cluster_interface: "{{ network_interface }}"
 #swift_storage_interface: "{{ storage_interface }}"
 #swift_replication_interface: "{{ swift_storage_interface }}"
 #tunnel_interface: "{{ network_interface }}"
@@ -116,7 +115,6 @@
 #network_address_family: "ipv4"
 #api_address_family: "{{ network_address_family }}"
 #storage_address_family: "{{ network_address_family }}"
-#cluster_address_family: "{{ network_address_family }}"
 #swift_storage_address_family: "{{ storage_address_family }}"
 #swift_replication_address_family: "{{ swift_storage_address_family }}"
 #migration_address_family: "{{ api_address_family }}"
diff --git a/tools/validate-all-file.py b/tools/validate-all-file.py
index 22a2d8be30..11def1f65f 100755
--- a/tools/validate-all-file.py
+++ b/tools/validate-all-file.py
@@ -43,7 +43,6 @@ YAML_EXCLUDE_PATTERNS = ['.tox', '.testrepository', '.git',
 KOLLA_NETWORKS = [
     'api',
     'storage',
-    'cluster',
     'swift_storage',
     'swift_replication',
     'migration',
@@ -124,7 +123,6 @@ def check_json_j2():
         context = {
             'hostvars': hostvars(),
             'groups': groups(),
-            'cluster_interface': 'cluster_interface',
             'storage_interface': 'storage_interface',
             'inventory_hostname': 'hostname'
         }