Merge "Remove Nova parameters that are no longer used"

This commit is contained in:
Zuul 2020-04-01 13:16:23 +00:00 committed by Gerrit Code Review
commit d6728fa3b6
7 changed files with 0 additions and 17 deletions

View File

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

View File

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

View File

@ -88,10 +88,6 @@ parameters:
description: > description: >
Remove configuration that is not generated by TripleO. Used to avoid Remove configuration that is not generated by TripleO. Used to avoid
configuration remnants after upgrades. configuration remnants after upgrades.
NovaIPv6:
default: false
description: Enable IPv6 features in Nova
type: boolean
UpgradeLevelNovaCompute: UpgradeLevelNovaCompute:
type: string type: string
description: Nova Compute upgrade level description: Nova Compute upgrade level
@ -375,7 +371,6 @@ outputs:
nova::db::database_max_retries: -1 nova::db::database_max_retries: -1
nova::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout} nova::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
nova::db::sync_api::db_sync_timeout: {get_param: DatabaseSyncTimeout} nova::db::sync_api::db_sync_timeout: {get_param: DatabaseSyncTimeout}
nova::use_ipv6: {get_param: NovaIPv6}
nova::network::neutron::ovs_bridge: {get_param: NovaOVSBridge} nova::network::neutron::ovs_bridge: {get_param: NovaOVSBridge}
nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute} nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute}
nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour} nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour}

View File

@ -130,10 +130,6 @@ parameters:
type: boolean type: boolean
tags: tags:
- role_specific - role_specific
NovaComputeLibvirtVifDriver:
default: ''
description: Libvirt VIF driver configuration for the network
type: string
NovaPCIPassthrough: NovaPCIPassthrough:
description: > description: >
List of PCI Passthrough whitelist parameters. List of PCI Passthrough whitelist parameters.
@ -685,7 +681,6 @@ outputs:
- enable_live_migration_tunnelled - enable_live_migration_tunnelled
- true - true
- false - false
nova::compute::neutron::libvirt_vif_driver: {get_param: NovaComputeLibvirtVifDriver}
# NOTE: bind IP is found in hiera replacing the network name with the # NOTE: bind IP is found in hiera replacing the network name with the
# local node IP for the given network; replacement examples # local node IP for the given network; replacement examples
# (eg. for internal_api): # (eg. for internal_api):

View File

@ -54,8 +54,6 @@ parameter_defaults:
CorosyncIPv6: True CorosyncIPv6: True
# Enable IPv6 for MongoDB. This is required when MongoDB is using an IPv6 IP. # Enable IPv6 for MongoDB. This is required when MongoDB is using an IPv6 IP.
MongoDbIPv6: True MongoDbIPv6: True
# Enable various IPv6 features in Nova.
NovaIPv6: True
# Enable IPv6 environment for RabbitMQ. # Enable IPv6 environment for RabbitMQ.
RabbitIPv6: True RabbitIPv6: True
# Enable IPv6 environment for Memcached. # Enable IPv6 environment for Memcached.

View File

@ -59,8 +59,6 @@ parameter_defaults:
CephIPv6: True CephIPv6: True
# Enable IPv6 for Corosync. This is required when Corosync is using an IPv6 IP in the cluster. # Enable IPv6 for Corosync. This is required when Corosync is using an IPv6 IP in the cluster.
CorosyncIPv6: True CorosyncIPv6: True
# Enable various IPv6 features in Nova.
NovaIPv6: True
# Enable IPv6 environment for RabbitMQ. # Enable IPv6 environment for RabbitMQ.
RabbitIPv6: True RabbitIPv6: True
# Enable IPv6 environment for Memcached. # Enable IPv6 environment for Memcached.

View File

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