diff --git a/environments/ips-from-pool-all.yaml b/environments/ips-from-pool-all.yaml index d4eccbcf41..dc376be2b2 100644 --- a/environments/ips-from-pool-all.yaml +++ b/environments/ips-from-pool-all.yaml @@ -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 diff --git a/environments/network-management-v6.yaml b/environments/network-management-v6.yaml index 59056217e9..4fcd173f2f 100644 --- a/environments/network-management-v6.yaml +++ b/environments/network-management-v6.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 diff --git a/environments/network-management.yaml b/environments/network-management.yaml index 5f50bb15e0..2fafc3a3aa 100644 --- a/environments/network-management.yaml +++ b/environments/network-management.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 diff --git a/network/config/bond-with-vlans/README.md b/network/config/bond-with-vlans/README.md index afe7177641..0796242bad 100644 --- a/network/config/bond-with-vlans/README.md +++ b/network/config/bond-with-vlans/README.md @@ -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: diff --git a/network/config/multiple-nics/README.md b/network/config/multiple-nics/README.md index 0d8a0f03ee..45d5b20e32 100644 --- a/network/config/multiple-nics/README.md +++ b/network/config/multiple-nics/README.md @@ -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: diff --git a/network/config/single-nic-vlans/README.md b/network/config/single-nic-vlans/README.md index f9c2e51280..4173862591 100644 --- a/network/config/single-nic-vlans/README.md +++ b/network/config/single-nic-vlans/README.md @@ -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: diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 36c54f7da9..1e1e949962 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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