Browse Source

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 ebfe7897af)
changes/79/761879/1
Alexey Stupnikov 9 months ago
committed by Rajesh Tailor
parent
commit
6b99abc5db
7 changed files with 0 additions and 17 deletions
  1. +0
    -1
      ci/environments/network/multiple-nics-ipv6/network-isolation-absolute.yaml
  2. +0
    -1
      ci/environments/network/multiple-nics-ipv6/network-isolation.yaml
  3. +0
    -5
      deployment/nova/nova-base-puppet.yaml
  4. +0
    -5
      deployment/nova/nova-compute-container-puppet.yaml
  5. +0
    -2
      environments/network-isolation-v6-all.j2.yaml
  6. +0
    -2
      environments/network-isolation-v6.j2.yaml
  7. +0
    -1
      environments/nova-nuage-config.yaml

+ 0
- 1
ci/environments/network/multiple-nics-ipv6/network-isolation-absolute.yaml View File

@@ -29,7 +29,6 @@ resource_registry:
parameter_defaults:
CephIPv6: True
CorosyncIPv6: True
NovaIPv6: True
RabbitIPv6: True
MemcachedIPv6: True
ManilaIPv6: True


+ 0
- 1
ci/environments/network/multiple-nics-ipv6/network-isolation.yaml View File

@@ -29,7 +29,6 @@ resource_registry:
parameter_defaults:
CephIPv6: True
CorosyncIPv6: True
NovaIPv6: True
RabbitIPv6: True
MemcachedIPv6: True
ManilaIPv6: True

+ 0
- 5
deployment/nova/nova-base-puppet.yaml View File

@@ -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}


+ 0
- 5
deployment/nova/nova-compute-container-puppet.yaml View File

@@ -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):


+ 0
- 2
environments/network-isolation-v6-all.j2.yaml View File

@@ -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.


+ 0
- 2
environments/network-isolation-v6.j2.yaml View File

@@ -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.


+ 0
- 1
environments/nova-nuage-config.yaml View File

@@ -8,6 +8,5 @@ parameter_defaults:
NuageStandbyController: '0.0.0.0'
NovaOVSBridge: 'default_bridge'
NovaComputeLibvirtType: 'default_type'
NovaIPv6: False
NuageMetadataProxySharedSecret: 'default'
NuageNovaApiEndpoint: 'default_endpoint'

Loading…
Cancel
Save