Merge "Fix networking settings for ObjectStorage role" into stable/newton
This commit is contained in:
commit
4df6d4320a
|
@ -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
|
||||
|
|
|
@ -19,7 +19,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
|
||||
|
|
|
@ -19,7 +19,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:
|
||||
|
|
|
@ -29,12 +29,12 @@ resource_registry:
|
|||
OS::TripleO::{{role.name}}::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::{{role.name}}::Ports::ManagementPort: network/ports/noop.yaml
|
||||
{% else %}
|
||||
OS::TripleO::SwiftStorage::Ports::ExternalPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::InternalApiPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::StoragePort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::SwiftStorage::Ports::ManagementPort: network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ExternalPort: network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::InternalApiPort: network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::StoragePort: network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::TenantPort: network/ports/noop.yaml
|
||||
OS::TripleO::ObjectStorage::Ports::ManagementPort: network/ports/noop.yaml
|
||||
{% endif %}
|
||||
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
|
||||
{% endfor %}
|
||||
|
|
Loading…
Reference in New Issue