Fix network names when using network isolation
authorMichele Baldessari <michele@acksyn.org>
Wed, 14 Jun 2017 08:07:48 +0000 (10:07 +0200)
committerMichele Baldessari <michele@acksyn.org>
Wed, 14 Jun 2017 08:10:03 +0000 (10:10 +0200)
When we merged If3989f24f077738845d2edbee405bd9198e7b7db we correctly
used name_lower for most things but we left out the the
OS::TripleO::Network resource which would cause errors like the
following:

Could not fetch contents for file:///tmp/tripleoclient-LdqQGJ/tripleo-heat-templates/network/internalapi.yaml

The reason is that the network filename is called internal_api.yaml.

Change-Id: I40f268668ed948e5d41ed0ff5a8fc954cef7b17c
Closes-Bug: #1697883

environments/network-isolation.j2.yaml

index 3ef9b27..6a7318f 100644 (file)
@@ -13,7 +13,7 @@
 resource_registry:
   # networks as defined in network_data.yaml
   {%- for network in networks if network.enabled|default(true) %}
-  OS::TripleO::Network::{{network.name}}: ../network/{{network.name.lower()}}.yaml
+  OS::TripleO::Network::{{network.name}}: ../network/{{network.name_lower|default(network.name.lower())}}.yaml
   {%- endfor %}
 
   # Port assignments for the VIPs