From 48989090edea096ad34473b28bfdb5ccbd913f0a Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Wed, 25 Oct 2017 20:50:23 +0200 Subject: [PATCH] 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 (cherry picked from commit 65d38fa8de6278512de8577c0dd8935b57da8422) --- environments/ips-from-pool-all.yaml | 12 ++++++------ environments/network-management-v6.yaml | 2 +- environments/network-management.yaml | 2 +- network/config/bond-with-vlans/README.md | 2 +- network/config/multiple-nics/README.md | 2 +- network/config/single-nic-vlans/README.md | 2 +- overcloud-resource-registry-puppet.j2.yaml | 12 ++++++------ 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/environments/ips-from-pool-all.yaml b/environments/ips-from-pool-all.yaml index 8756375302..d49585b75a 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 812e84f368..e336f0d922 100644 --- a/environments/network-management-v6.yaml +++ b/environments/network-management-v6.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 diff --git a/environments/network-management.yaml b/environments/network-management.yaml index 041617be41..0fe7dbb457 100644 --- a/environments/network-management.yaml +++ b/environments/network-management.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 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 2004efffc9..f82ef80f6e 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -31,12 +31,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 %}