Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(eni): Deprecate ENI as an input configuration format #5561

Merged
merged 1 commit into from
Jul 26, 2024
Merged

chore(eni): Deprecate ENI as an input configuration format #5561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cloudinit/sources/DataSourceConfigDrive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,14 @@ def network_config(self):
elif self.network_eni is not None:
self._network_config = eni.convert_eni_data(self.network_eni)
LOG.debug("network config provided via converted eni data")
util.deprecate(
deprecated="Eni network configuration in ConfigDrive",
deprecated_version="24.3",
extra_message=(
"You can use openstack's network "
"configuration format instead"
),
)
else:
LOG.debug("no network configuration available")
return self._network_config
Expand Down
7 changes: 7 additions & 0 deletions cloudinit/sources/DataSourceNoCloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ def check_instance_id(self, sys_cfg):
def network_config(self):
if self._network_config is None:
if self._network_eni is not None:
util.deprecate(
deprecated="Eni network configuration in NoCloud",
deprecated_version="24.3",
extra_message=(
"You can use network v1 or network v2 instead"
),
)
self._network_config = eni.convert_eni_data(self._network_eni)
return self._network_config

Expand Down
20 changes: 0 additions & 20 deletions doc/rtd/reference/network-config-format-eni.rst
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions doc/rtd/reference/network-config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ The following datasources optionally provide network configuration:
- :ref:`datasource_config_drive`

- `OpenStack Metadata Service Network`_
- :ref:`network_config_eni`

- :ref:`datasource_digital_ocean`

Expand All @@ -140,15 +139,9 @@ The following datasources optionally provide network configuration:

- :ref:`network_config_v1`
- :ref:`network_config_v2`
- :ref:`network_config_eni`

- :ref:`datasource_opennebula`

- :ref:`network_config_eni`

- :ref:`datasource_openstack`

- :ref:`network_config_eni`
- `OpenStack Metadata Service Network`_

- :ref:`datasource_smartos`
Expand All @@ -168,7 +161,6 @@ For more information on network configuration formats:
.. toctree::
:maxdepth: 1

network-config-format-eni.rst
network-config-format-v1.rst
network-config-format-v2.rst

Expand Down
Loading