Remove unused environment files for undercloud
Nova, Swift, Cinder and Keystone are no longer supported Undercloud, and were removed by the dependent patches. Depends-on: https://review.opendev.org/c/openstack/python-tripleoclient/+/841205 Depends-on: https://review.opendev.org/c/openstack/python-tripleoclient/+/827257 Change-Id: I10707e6ecd6b70eeed8ab6a93bc815e9c074eb05
This commit is contained in:
parent
3378b4c37e
commit
8c3e0e901c
@ -1,6 +0,0 @@
|
||||
# DEPRECATED. This file will be removed in the Stein release as it is no longer
|
||||
# needed
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CinderApi: ../../deployment/cinder/cinder-api-container-puppet.yaml
|
||||
OS::TripleO::Services::CinderScheduler: ../../deployment/cinder/cinder-scheduler-container-puppet.yaml
|
||||
OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml
|
@ -1,12 +0,0 @@
|
||||
parameter_defaults:
|
||||
IronicAuthStrategy: keystone
|
||||
NeutronAuthStrategy: keystone
|
||||
KeystoneCorsAllowedOrigin: '*'
|
||||
KeystoneEnableMember: true
|
||||
# Increase the Token expiration time until we fix the actual session bug:
|
||||
# https://bugs.launchpad.net/tripleo/+bug/1761050
|
||||
TokenExpiration: 14400
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::Keystone: ../deployment/keystone/keystone-container-puppet.yaml
|
||||
OS::TripleO::Services::Memcached: ../deployment/memcached/memcached-container-puppet.yaml
|
@ -1,34 +0,0 @@
|
||||
# This heat environment can be used to enable the nova/glance services used on
|
||||
# the undercloud.
|
||||
|
||||
parameter_defaults:
|
||||
NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
|
||||
NovaSchedulerEnabledFilters:
|
||||
- TripleOCapabilitiesFilter
|
||||
- ComputeCapabilitiesFilter
|
||||
- ComputeFilter
|
||||
- ImagePropertiesFilter
|
||||
- ServerGroupAntiAffinityFilter
|
||||
- ServerGroupAffinityFilter
|
||||
NovaSchedulerMaxAttempts: 30
|
||||
# Disable compute auto disabling:
|
||||
# As part of Pike, nova introduced a change to have the nova-compute
|
||||
# process automatically disable the nova-compute instance in the case of
|
||||
# consecutive build failures. This can lead to odd errors when deploying
|
||||
# the ironic nodes on the undercloud as you end up with a ComputeFilter
|
||||
# error. This parameter disables this functionality for the undercloud since
|
||||
# we do not want the nova-compute instance running on the undercloud for
|
||||
# Ironic to be disabled in the case of multiple deployment failures.
|
||||
NovaAutoDisabling: '0'
|
||||
NovaCorsAllowedOrigin: '*'
|
||||
NovaSyncPowerStateInterval: -1
|
||||
IronicConfigureSwiftTempUrlKey: true
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NovaApi: ../deployment/nova/nova-api-container-puppet.yaml
|
||||
OS::TripleO::Services::NovaConductor: ../deployment/nova/nova-conductor-container-puppet.yaml
|
||||
OS::TripleO::Services::NovaIronic: ../deployment/nova/nova-ironic-container-puppet.yaml
|
||||
OS::TripleO::Services::NovaScheduler: ../deployment/nova/nova-scheduler-container-puppet.yaml
|
||||
OS::TripleO::Services::GlanceApi: ../deployment/glance/glance-api-container-puppet.yaml
|
||||
OS::TripleO::Services::PlacementApi: ../deployment/placement/placement-api-container-puppet.yaml
|
||||
OS::TripleO::Services::Logging::PlacementApi: ../deployment/logging/files/placement-api.yaml
|
@ -1,12 +0,0 @@
|
||||
parameter_defaults:
|
||||
SwiftCorsAllowedOrigin: '*'
|
||||
SwiftReplicas: 1
|
||||
SwiftWorkers: 2
|
||||
SwiftAccountWorkers: 2
|
||||
SwiftContainerWorkers: 2
|
||||
SwiftObjectWorkers: 2
|
||||
|
||||
resource_registry:
|
||||
OS::TripleO::Services::SwiftProxy: ../deployment/swift/swift-proxy-container-puppet.yaml
|
||||
OS::TripleO::Services::SwiftStorage: ../deployment/swift/swift-storage-container-puppet.yaml
|
||||
OS::TripleO::Services::SwiftRingBuilder: ../deployment/swift/swift-ringbuilder-container-puppet.yaml
|
Loading…
Reference in New Issue
Block a user