Merge "Remove the deprecated storage_interface var"

ansible/group_vars/all.yml

@@ -220,9 +220,7 @@ network_interface: "eth0"
 neutron_external_interface: "eth1"
 kolla_external_vip_interface: "{{ network_interface }}"
 api_interface: "{{ network_interface }}"
-# NOTE: storage_interface is deprecated, please set swift_storage_interface directly instead
-storage_interface: "{{ network_interface }}"
-swift_storage_interface: "{{ storage_interface }}"
+swift_storage_interface: "{{ network_interface }}"
 swift_replication_interface: "{{ swift_storage_interface }}"
 migration_interface: "{{ api_interface }}"
 tunnel_interface: "{{ network_interface }}"

ansible/inventory/multinode

@@ -24,7 +24,7 @@ monitoring01
 # When compute nodes and control nodes use different interfaces,
 # you need to comment out "api_interface" and other interfaces from the globals.yml
 # and specify like below:
-#compute01 neutron_external_interface=eth0 api_interface=em1 storage_interface=em1 tunnel_interface=em1
+#compute01 neutron_external_interface=eth0 api_interface=em1 tunnel_interface=em1
 
 [storage]
 storage01

doc/source/admin/production-architecture-guide.rst

@@ -54,14 +54,9 @@ In Kolla operators should configure following network interfaces:
   ``kolla_enable_tls_external`` is set to yes. Defaults to
   ``network_interface``.
 
-* ``storage_interface`` (**deprecated**) - Sets the default for
-  ``swift_storage_interface``. Defaults to ``network_interface``.
-  Please set ``swift_storage_interface`` directly instead.
-
 * ``swift_storage_interface`` - This interface is used by Swift for storage
   access traffic.  This can be heavily utilized so it's recommended to use
-  a high speed network fabric. Defaults to ``storage_interface``, will default
-  directly to ``network_interface`` in a future release.
+  a high speed network fabric. Defaults to ``network_interface``.
 
 * ``swift_replication_interface`` - This interface is used by Swift for storage
   replication traffic.  This can be heavily utilized so it's recommended to use

etc/kolla/globals.yml

@@ -118,9 +118,7 @@ workaround_ansible_issue_8743: yes
 # the 'network_interface'. These interfaces must contain an IP address.
 #kolla_external_vip_interface: "{{ network_interface }}"
 #api_interface: "{{ network_interface }}"
-# NOTE: storage_interface is deprecated, please set swift_storage_interface directly instead
-#storage_interface: "{{ network_interface }}"
-#swift_storage_interface: "{{ storage_interface }}"
+#swift_storage_interface: "{{ network_interface }}"
 #swift_replication_interface: "{{ swift_storage_interface }}"
 #tunnel_interface: "{{ network_interface }}"
 #dns_interface: "{{ network_interface }}"

releasenotes/notes/remove-deprecated-storage_interface-2221a8a214b685b9.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated ``storage_interface`` variable has been removed. Please
+    set the ``swift_storage_interface`` directly.

tools/validate-all-file.py

@@ -127,7 +127,6 @@ def check_json_j2():
             'api_interface_address': '',
             'kolla_internal_fqdn': '',
             'octavia_provider_drivers': '',
-            'storage_interface': 'storage_interface',
         }
         data = template.render(**context)
         json.loads(data)