openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable swift on undercloud by default"

Browse Source
This commit is contained in:
Zuul 2021-02-05 11:16:20 +00:00 committed by Gerrit Code Review
commit f6e45e0e84
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/undercloud-enable-swift.yaml Normal file
View File

@ -0,0 +1,12 @@
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

9
environments/undercloud.yaml
View File

@ -48,6 +48,9 @@ resource_registry:
OS::TripleO::Services::Logging::PlacementApi: OS::Heat::None OS::TripleO::Services::Logging::PlacementApi: OS::Heat::None
OS::TripleO::Services::GlanceApi: OS::Heat::None OS::TripleO::Services::GlanceApi: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
# Services we don't ever want configured. See LP#1824030 # Services we don't ever want configured. See LP#1824030
OS::TripleO::Services::Pacemaker: OS::Heat::None OS::TripleO::Services::Pacemaker: OS::Heat::None
@ -149,12 +152,6 @@ parameter_defaults:
# This allows MTU > 1500 for the overcloud if local_mtu is set to 1500 # This allows MTU > 1500 for the overcloud if local_mtu is set to 1500
# See LP#1826729 # See LP#1826729
TenantNetPhysnetMtu: 0 TenantNetPhysnetMtu: 0
SwiftCorsAllowedOrigin: '*'
SwiftReplicas: 1
SwiftWorkers: 2
SwiftAccountWorkers: 2
SwiftContainerWorkers: 2
SwiftObjectWorkers: 2
# A list of static routes for the control plane network. Ensure traffic to # A list of static routes for the control plane network. Ensure traffic to
# nodes on remote control plane networks use the correct network path. # nodes on remote control plane networks use the correct network path.
# Example: # Example: