From 1bb4acbf9a1565b2b2a957727327ddaea8186df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 27 Jul 2022 12:37:59 +0200 Subject: [PATCH] Remove the deprecated storage_interface var Change-Id: I63673761959a560e97c848f092f086ceba25839a --- ansible/group_vars/all.yml | 4 +--- ansible/inventory/multinode | 2 +- doc/source/admin/production-architecture-guide.rst | 7 +------ etc/kolla/globals.yml | 4 +--- ...move-deprecated-storage_interface-2221a8a214b685b9.yaml | 5 +++++ tools/validate-all-file.py | 1 - 6 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/remove-deprecated-storage_interface-2221a8a214b685b9.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 480ccf7b4c..f8bc41c296 100644 --- a/ansible/group_vars/all.yml +++ b/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 }}" diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 8018366940..dd9273d5c2 100644 --- a/ansible/inventory/multinode +++ b/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 diff --git a/doc/source/admin/production-architecture-guide.rst b/doc/source/admin/production-architecture-guide.rst index 30fc59e74b..e5cd896f9c 100644 --- a/doc/source/admin/production-architecture-guide.rst +++ b/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 diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 0912ee0c3a..e34256519d 100644 --- a/etc/kolla/globals.yml +++ b/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 }}" diff --git a/releasenotes/notes/remove-deprecated-storage_interface-2221a8a214b685b9.yaml b/releasenotes/notes/remove-deprecated-storage_interface-2221a8a214b685b9.yaml new file mode 100644 index 0000000000..d5551e5e48 --- /dev/null +++ b/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. diff --git a/tools/validate-all-file.py b/tools/validate-all-file.py index 0bad735d81..dc16bf382a 100755 --- a/tools/validate-all-file.py +++ b/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)