Special case non-matching ObjectStorage role port names

Unfortunately we use "SwiftStorage" in the ObjectStorage role
template, so we have to special-case this for backwards compatibility
or deployments enabling the ObjectStorage role will fail.

Ideally we'd align the port names in the objectstorage-role.yaml, but we
can't becauuse all the ports would be replaced in existing deployments
on update.

Change-Id: Ia07e193d2b9a4d33c6272c2b4448133584b81350
Closes-Bug: #1632663

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 1102a7f..65cc9e3 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -16,14 +16,23 @@ resource_registry:
   OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None
   OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
   # Port assignments for the {{role.name}} role
+  # Note we have to special-case ObjectStorage for backwards compatibility
+  {% if role.name != 'ObjectStorage' %}
   OS::TripleO::{{role.name}}::Ports::ExternalPort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::InternalApiPort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::StoragePort: network/ports/noop.yaml
   OS::TripleO::{{role.name}}::Ports::StorageMgmtPort: network/ports/noop.yaml
   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
+  {% endif %}
   OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
-
 {% endfor %}
 
   # This resource registry entry will override the one generated by default