Fix networking settings for ObjectStorage role
The role name is actually "ObjectStorage", not "SwiftStorage". This leads do failing deployments if one or more ObjectStorage nodes are deployed on the overcloud. Closes-Bug: 1727475 Change-Id: I96fd27bdad5d417f23550ecc3387d81fd3c5418a
This commit is contained in:
parent
2a7efbada6
commit
65d38fa8de
|
@ -22,12 +22,12 @@ resource_registry:
|
|||
OS::TripleO::CephStorage::Ports::TenantPort: ../network/ports/noop.yaml
|
||||
#OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
|
||||
|
||||
OS::TripleO::SwiftStorage::Ports::ExternalPort: ../network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::TenantPort: ../network/ports/noop.yaml
|
||||
#OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ExternalPort: ../network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::TenantPort: ../network/ports/noop.yaml
|
||||
#OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
|
||||
|
||||
OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml
|
||||
OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
|
||||
|
|
|
@ -23,7 +23,7 @@ resource_registry:
|
|||
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml
|
||||
|
||||
# Port assignments for the swift storage role
|
||||
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml
|
||||
|
||||
# Port assignments for the block storage role
|
||||
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management_v6.yaml
|
||||
|
|
|
@ -23,7 +23,7 @@ resource_registry:
|
|||
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
|
||||
# Port assignments for the swift storage role
|
||||
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
|
||||
# Port assignments for the block storage role
|
||||
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
|
|
|
@ -41,7 +41,7 @@ that looks something like this:
|
|||
OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
|
||||
Or use this Heat environment file:
|
||||
|
|
|
@ -31,7 +31,7 @@ that looks something like this:
|
|||
OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
|
||||
Or use this Heat environment file:
|
||||
|
|
|
@ -41,7 +41,7 @@ that looks something like this:
|
|||
OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management.yaml
|
||||
|
||||
Or use this Heat environment file:
|
||||
|
|
|
@ -31,7 +31,7 @@ resource_registry:
|
|||
{%- else %}
|
||||
# Note we have to special-case ObjectStorage for backwards compatibility
|
||||
{%- for network in networks %}
|
||||
OS::TripleO::SwiftStorage::Ports::{{network.name}}Port: network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::{{network.name}}Port: network/ports/noop.yaml
|
||||
{%- endfor %}
|
||||
{%- endif %}
|
||||
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
|
||||
|
|
Loading…
Reference in New Issue