openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix networking settings for ObjectStorage role pt 2" into stable/ocata

This commit is contained in:
Zuul 2018-03-07 17:16:15 +00:00 committed by Gerrit Code Review
parent 298599d933 c23eb809d2
commit 9ac2d8b500
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/network-isolation-no-tunneling.yaml
View File

@ -45,12 +45,12 @@ resource_registry:
#OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
# Port assignments for the swift storage role
OS::TripleO::SwiftStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage.yaml
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
OS::TripleO::SwiftStorage::Ports::TenantPort: ../network/ports/noop.yaml
#OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::ObjectStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage.yaml
OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
OS::TripleO::ObjectStorage::Ports::TenantPort: ../network/ports/noop.yaml
#OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
# Port assignments for the block storage role
OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml

6
environments/network-isolation-v6.yaml
View File

@ -33,9 +33,9 @@ resource_registry:
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
# Port assignments for the swift storage role
OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml
OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage_v6.yaml
OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_v6.yaml
# Port assignments for the block storage role
OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api_v6.yaml

12
environments/network-isolation.yaml
View File

@ -43,12 +43,12 @@ resource_registry:
#OS::TripleO::CephStorage::Ports::ManagementPort: ../network/ports/management.yaml
# Port assignments for the swift storage role
OS::TripleO::SwiftStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::SwiftStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
OS::TripleO::SwiftStorage::Ports::StoragePort: ../network/ports/storage.yaml
OS::TripleO::SwiftStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
OS::TripleO::SwiftStorage::Ports::TenantPort: ../network/ports/noop.yaml
#OS::TripleO::SwiftStorage::Ports::ManagementPort: ../network/ports/management.yaml
OS::TripleO::ObjectStorage::Ports::ExternalPort: ../network/ports/noop.yaml
OS::TripleO::ObjectStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml
OS::TripleO::ObjectStorage::Ports::StoragePort: ../network/ports/storage.yaml
OS::TripleO::ObjectStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
OS::TripleO::ObjectStorage::Ports::TenantPort: ../network/ports/noop.yaml
#OS::TripleO::ObjectStorage::Ports::ManagementPort: ../network/ports/management.yaml
# Port assignments for the block storage role
OS::TripleO::BlockStorage::Ports::ExternalPort: ../network/ports/noop.yaml

12
puppet/objectstorage-role.yaml
View File

@ -179,42 +179,42 @@ resources:
type: OS::TripleO::ObjectStorage::NodeUserData
ExternalPort:
type: OS::TripleO::SwiftStorage::Ports::ExternalPort
type: OS::TripleO::ObjectStorage::Ports::ExternalPort
properties:
ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
IPPool: {get_param: SwiftStorageIPs}
NodeIndex: {get_param: NodeIndex}
InternalApiPort:
type: OS::TripleO::SwiftStorage::Ports::InternalApiPort
type: OS::TripleO::ObjectStorage::Ports::InternalApiPort
properties:
ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
IPPool: {get_param: SwiftStorageIPs}
NodeIndex: {get_param: NodeIndex}
StoragePort:
type: OS::TripleO::SwiftStorage::Ports::StoragePort
type: OS::TripleO::ObjectStorage::Ports::StoragePort
properties:
ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
IPPool: {get_param: SwiftStorageIPs}
NodeIndex: {get_param: NodeIndex}
StorageMgmtPort:
type: OS::TripleO::SwiftStorage::Ports::StorageMgmtPort
type: OS::TripleO::ObjectStorage::Ports::StorageMgmtPort
properties:
ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
IPPool: {get_param: SwiftStorageIPs}
NodeIndex: {get_param: NodeIndex}
TenantPort:
type: OS::TripleO::SwiftStorage::Ports::TenantPort
type: OS::TripleO::ObjectStorage::Ports::TenantPort
properties:
ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
IPPool: {get_param: SwiftStorageIPs}
NodeIndex: {get_param: NodeIndex}
ManagementPort:
type: OS::TripleO::SwiftStorage::Ports::ManagementPort
type: OS::TripleO::ObjectStorage::Ports::ManagementPort
properties:
ControlPlaneIP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
IPPool: {get_param: SwiftStorageIPs}