From b6e904213e26c2c007fba30b8928f49f77f3779b Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 4 Apr 2023 14:00:24 +0200 Subject: [PATCH] Remove nova_network_services mapping At the moment we don't really utilize neutron_provider_networks mapping except of 2 quite specific drivers, that are NSX and Nuage. For these 2 usecases we suggest using overrides functionality instead. Change-Id: I7d905a1dbda1ec722b161b96742247c806bed162 --- defaults/main.yml | 14 +------------- ...network_type_deprecation-86da18bfc827818a.yaml | 15 +++++++++++++++ templates/nova.conf.j2 | 3 --- 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/nova_network_type_deprecation-86da18bfc827818a.yaml diff --git a/defaults/main.yml b/defaults/main.yml index c2a88efb..959cc818 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -256,7 +256,7 @@ nova_serialconsoleproxy_base_url: "{{ nova_serialconsoleproxy_base_uri }}" nova_serialconsoleproxy_serialconsole_proxyserver_proxyclient_address: "{{ nova_management_address }}" ## Nova metadata -nova_metadata_proxy_enabled: "{{ nova_network_services[nova_network_type]['metadata_proxy_enabled'] | bool }}" +nova_metadata_proxy_enabled: True nova_metadata_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}" nova_metadata_port: 8775 @@ -309,18 +309,6 @@ nova_vencrypt_auth_scheme: "vencrypt,none" ## Nova global config nova_image_cache_manager_interval: 0 -nova_network_type: linuxbridge - -nova_network_services: - linuxbridge: - metadata_proxy_enabled: True - nuage: - metadata_proxy_enabled: True - ovs_bridge: alubr0 - nsx: - metadata_proxy_enabled: True - ovs_bridge: nsx-managed - # Nova Scheduler nova_cpu_allocation_ratio: 2.0 nova_disk_allocation_ratio: 1.0 diff --git a/releasenotes/notes/nova_network_type_deprecation-86da18bfc827818a.yaml b/releasenotes/notes/nova_network_type_deprecation-86da18bfc827818a.yaml new file mode 100644 index 00000000..72772662 --- /dev/null +++ b/releasenotes/notes/nova_network_type_deprecation-86da18bfc827818a.yaml @@ -0,0 +1,15 @@ +--- + +deprecations: + - | + Variables ``nova_network_type`` and ``nova_network_services`` have been + deptecated and will be silently ignored in the future. + Please, use ``nova_nova_conf_overrides`` if you need to define + ``ovs_bridge`` option for specific network drivers, like nsx or nuage. + +upgrade: + - | + If you're using NSX or Nuage network drivers, make sure you have replaced + definition of ``nova_network_type`` to appropriate + ``nova_nova_conf_overrides``. Please, consult with os_neutron + documenteation on the required overrides. diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index 6d762e27..8dc3a8ae 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -157,9 +157,6 @@ auth_url = {{ keystone_service_adminurl }} insecure = {{ keystone_service_adminuri_insecure | bool }} metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }} service_metadata_proxy = {{ nova_metadata_proxy_enabled }} -{% if nova_network_services[nova_network_type]['ovs_bridge'] is defined %} -ovs_bridge = {{ nova_network_services[nova_network_type]['ovs_bridge'] }} -{% endif %} {% if nova_ceilometer_enabled %} [notifications]