Merge "Do not generate apache/haproxy certs for invalid networks"

puppet/services/apache.j2.yaml

@@ -61,10 +61,12 @@ resources:
         # NOTE(jaosorior) Get unique network names to create
         # certificates for those. We skip the tenant network since
         # we don't need a certificate for that.
-        yaql:
+        - ctlplane
-          expression: list($.data.values().toSet().where($ != tenant))
+{%- for network in networks %}
-          data:
+  {%- if network.name_lower != 'tenant' %}
-            get_param: ServiceNetMap
+        - {{network.name_lower}}
+  {%- endif %}
+{%- endfor %}
 
 outputs:
   role_data:

puppet/services/haproxy-internal-tls-certmonger.j2.yaml

@@ -47,11 +47,12 @@ resources:
         # certificates for those. We skip the tenant network since
         # we don't need a certificate for that, and the external
         # network will be handled in another template.
-        yaql:
+        - ctlplane
-          expression: list($.data.map.items().map($1[1])).distinct().where($ != external and $ != tenant)
+{%- for network in networks if network.vip|default(false) %}
-          data:
+  {%- if network.name_lower != 'external' and network.name_lower != 'tenant' %}
-            map:
+        - {{network.name_lower}}
-              get_param: ServiceNetMap
+  {%- endif %}
+{%- endfor %}
 
 outputs:
   role_data:

tripleo_heat_templates/tests/test_yaql.py

@@ -33,13 +33,3 @@ class YAQLTestCase(base.BaseTestCase):
                 data = data[i]
             return data['yaql']['expression']
 
-    def test_apache_networks(self):
-        snippet = self.get_snippet(
-            'puppet/services/apache.yaml',
-            'resources.ApacheNetworks.properties.value')
-        self.assertEqual(
-            ['service'],
-            yaql.eval(
-                snippet,
-                {'data': {'nova': 'tenant', 'cinder': 'service',
-                          'glance': 'service'}}))