openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove registry special casing which no longer has any effect 

This was only needed when we need to special-case SwiftStorage, but
since we now have the resource names match the role name [1], having
the special casing will result in the same resource registry being
generated as when not having it.

[1] see change I96fd27bdad5d417f23550ecc3387d81fd3c5418a

Change-Id: I367081a8aa32178f1c8cf07bae2db3d0c0bc1258
This commit is contained in:
Jiri Stransky 2018-03-09 11:17:59 +01:00
parent c90e492d7e
commit 6f5776cc36
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
overcloud-resource-registry-puppet.j2.yaml
View File

@ -23,16 +23,9 @@ 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
{%- if role.name != 'ObjectStorage' %}
{%- for network in networks %}
{%- for network in networks %}
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: network/ports/noop.yaml
{%- endfor %}
{%- else %}
# Note we have to special-case ObjectStorage for backwards compatibility
{%- for network in networks %}
OS::TripleO::ObjectStorage::Ports::{{network.name}}Port: network/ports/noop.yaml
{%- endfor %}
{%- endif %}
{%- endfor %}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
{% endfor %}