From 6b99abc5dbcd7def554b7a322a62307074aa3912 Mon Sep 17 00:00:00 2001 From: Alexey Stupnikov Date: Sat, 28 Mar 2020 22:03:03 +0100 Subject: [PATCH] Remove Nova parameters that are no longer used Since Train release several puppet classes were removed from puppet-nova. At the same time, some of them are still defined in tripleo heat templates. - nova::use_ipv6 was used to configure IPv6 for nova-network. DEFAULT/use_ipv6 nova configuration option was deprecated in Ocata release and removed from puppet-nova in Train release. Setting this parameter in THT no longer affects anything. - nova::compute::neutron::libvirt_vif_driver seems like an artifact: though it was removed from puppet-nova only in Train release, actual nova configuration parameter was deprecated in IceHouse and hard-coded in Juno. Puppet-nova change id: I6f7fde1f475acec82bafc66183211f317b4c7795 Conflicts: deployment/nova/nova-base-puppet.yaml Resolved conflicts related to changes I42af3e39da76ae94ca7bbf2797f776c28a75f7e7 and If8a3d0a6db1b2950191ab62bdcfd7d2f12935de1 both of these are changes are not required in stable/train release. Change-Id: Ia269193f1f5215612165a2a0228bf4d1859b7b1e Closes-Bug: #1869528 (cherry picked from commit ebfe7897af7923eaa42b8c60b27d90145e6823e9) --- .../multiple-nics-ipv6/network-isolation-absolute.yaml | 1 - .../network/multiple-nics-ipv6/network-isolation.yaml | 1 - deployment/nova/nova-base-puppet.yaml | 5 ----- deployment/nova/nova-compute-container-puppet.yaml | 5 ----- environments/network-isolation-v6-all.j2.yaml | 2 -- environments/network-isolation-v6.j2.yaml | 2 -- environments/nova-nuage-config.yaml | 1 - 7 files changed, 17 deletions(-) diff --git a/ci/environments/network/multiple-nics-ipv6/network-isolation-absolute.yaml b/ci/environments/network/multiple-nics-ipv6/network-isolation-absolute.yaml index 62739321d3..69ada2d110 100644 --- a/ci/environments/network/multiple-nics-ipv6/network-isolation-absolute.yaml +++ b/ci/environments/network/multiple-nics-ipv6/network-isolation-absolute.yaml @@ -29,7 +29,6 @@ resource_registry: parameter_defaults: CephIPv6: True CorosyncIPv6: True - NovaIPv6: True RabbitIPv6: True MemcachedIPv6: True ManilaIPv6: True diff --git a/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml b/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml index c8f078e844..9b074d78ea 100644 --- a/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml +++ b/ci/environments/network/multiple-nics-ipv6/network-isolation.yaml @@ -29,7 +29,6 @@ resource_registry: parameter_defaults: CephIPv6: True CorosyncIPv6: True - NovaIPv6: True RabbitIPv6: True MemcachedIPv6: True ManilaIPv6: True diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index 8e874f5e6e..59f49b7ac9 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-puppet.yaml @@ -83,10 +83,6 @@ parameters: description: > Remove configuration that is not generated by TripleO. Used to avoid configuration remnants after upgrades. - NovaIPv6: - default: false - description: Enable IPv6 features in Nova - type: boolean UpgradeLevelNovaCompute: type: string description: Nova Compute upgrade level @@ -345,7 +341,6 @@ outputs: nova::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout} nova::db::sync_api::db_sync_timeout: {get_param: DatabaseSyncTimeout} nova::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} - nova::use_ipv6: {get_param: NovaIPv6} nova::network::neutron::neutron_ovs_bridge: {get_param: NovaOVSBridge} nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute} nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour} diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index dcf3c5e1c2..f2ee7ba197 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -130,10 +130,6 @@ parameters: type: boolean tags: - role_specific - NovaComputeLibvirtVifDriver: - default: '' - description: Libvirt VIF driver configuration for the network - type: string NovaPCIPassthrough: description: > List of PCI Passthrough whitelist parameters. @@ -743,7 +739,6 @@ outputs: - enable_live_migration_tunnelled - true - false - nova::compute::neutron::libvirt_vif_driver: {get_param: NovaComputeLibvirtVifDriver} # NOTE: bind IP is found in hiera replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api): diff --git a/environments/network-isolation-v6-all.j2.yaml b/environments/network-isolation-v6-all.j2.yaml index 55cecd9ad7..a924625fd2 100644 --- a/environments/network-isolation-v6-all.j2.yaml +++ b/environments/network-isolation-v6-all.j2.yaml @@ -54,8 +54,6 @@ parameter_defaults: CorosyncIPv6: True # Enable IPv6 for MongoDB. This is required when MongoDB is using an IPv6 IP. MongoDbIPv6: True - # Enable various IPv6 features in Nova. - NovaIPv6: True # Enable IPv6 environment for RabbitMQ. RabbitIPv6: True # Enable IPv6 environment for Memcached. diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml index 795926f278..f1c136accc 100644 --- a/environments/network-isolation-v6.j2.yaml +++ b/environments/network-isolation-v6.j2.yaml @@ -59,8 +59,6 @@ parameter_defaults: CephIPv6: True # Enable IPv6 for Corosync. This is required when Corosync is using an IPv6 IP in the cluster. CorosyncIPv6: True - # Enable various IPv6 features in Nova. - NovaIPv6: True # Enable IPv6 environment for RabbitMQ. RabbitIPv6: True # Enable IPv6 environment for Memcached. diff --git a/environments/nova-nuage-config.yaml b/environments/nova-nuage-config.yaml index e8e3aaa471..d5b8e68e99 100644 --- a/environments/nova-nuage-config.yaml +++ b/environments/nova-nuage-config.yaml @@ -8,6 +8,5 @@ parameter_defaults: NuageStandbyController: '0.0.0.0' NovaOVSBridge: 'default_bridge' NovaComputeLibvirtType: 'default_type' - NovaIPv6: False NuageMetadataProxySharedSecret: 'default' NuageNovaApiEndpoint: 'default_endpoint'