Drop resource registry override in ip-from-pool
Support for predictable IP addressing added to the default port templates in Rocky. Let's stop using the from_pool fake port templates, and instead use neutron ports for predictable IP's. Using neutron ports add's value by: - adding validations - ensure no allocation conflicts I.e if you forget to include the environment file on a stack update/scale neutron won't pick a conflicting address etc. The template (network/ports/port_from_pool.j2) to create the fake port is required by the undercloud. Operators can still use that if they want to not use neutron for some reason. Closes-Bug: #1866215 Change-Id: I4af2cb715dc5389821671aab9312a85d402f3215
This commit is contained in:
parent
cfd16b082b
commit
59ce59304d
|
@ -1,40 +1,4 @@
|
|||
# Environment file demonstrating how to pre-assign IPs to all node types
|
||||
resource_registry:
|
||||
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
|
||||
# Management network is optional and disabled by default
|
||||
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
|
||||
|
||||
OS::TripleO::Compute::Ports::ExternalPort: ../network/ports/noop.yaml
|
||||
OS::TripleO::Compute::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
|
||||
OS::TripleO::Compute::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
|
||||
OS::TripleO::Compute::Ports::StorageMgmtPort: ../network/ports/noop.yaml
|
||||
OS::TripleO::Compute::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
|
||||
#OS::TripleO::Compute::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
|
||||
|
||||
OS::TripleO::CephStorage::Ports::ExternalPort: ../network/ports/noop.yaml
|
||||
OS::TripleO::CephStorage::Ports::InternalApiPort: ../network/ports/noop.yaml
|
||||
OS::TripleO::CephStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
|
||||
OS::TripleO::CephStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
|
||||
OS::TripleO::CephStorage::Ports::TenantPort: ../network/ports/noop.yaml
|
||||
#OS::TripleO::CephStorage::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
|
||||
OS::TripleO::BlockStorage::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
|
||||
OS::TripleO::BlockStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
|
||||
OS::TripleO::BlockStorage::Ports::TenantPort: ../network/ports/noop.yaml
|
||||
#OS::TripleO::BlockStorage::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerIPs:
|
||||
|
|
|
@ -1,10 +1,3 @@
|
|||
resource_registry:
|
||||
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/external_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::InternalApiPort: ../network/ports/internal_api_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::StoragePort: ../network/ports/storage_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::StorageMgmtPort: ../network/ports/storage_mgmt_from_pool.yaml
|
||||
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ControllerIPs:
|
||||
# Each controller will get an IP from the lists below, first controller, first IP
|
||||
|
|
Loading…
Reference in New Issue