Check for available networks for a role

For network isolation, we specifcy available networks for role.
Therefore, there is no point in creating noop network resources for
networks that are not available/connected. This results in redundant
host entries for not available networks on overcloud nodes.

If a network is not available for a role we don't need to create
those extra noop resources.

For Undercloud/Standalone role we keep all networks in roles data
as the default ServiceNetMap specifies non ctlplane networks though
they map to ctlplane.

Change-Id: I07822ec0cba7eed352c0010eb893b5e5a522e95c
Depends-On: #https://review.openstack.org/624563
Closes-Bug: #1800811
(cherry picked from commit 5d275fb922)

overcloud.j2.yaml

@@ -514,7 +514,7 @@ resources:
     depends_on: {{role.name}}AllNodesDeployment
     properties:
       name: {{role.name}}AllNodesValidationDeployment
-      config: {get_resource: AllNodesValidationConfig}
+      config: {get_resource: {{role.name}}AllNodesValidationConfig}
       servers: {get_attr: [{{role.name}}Servers, value]}
 
   {{role.name}}IpListMap:
@@ -522,7 +522,7 @@ resources:
     properties:
       ControlPlaneIpList: {get_attr: [{{role.name}}, ip_address]}
 {%- for network in networks %}
-  {%- if network.enabled|default(true) %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
       {{network.name}}IpList: {get_attr: [{{role.name}}, {{network.name_lower}}_ip_address]}
   {%- else %}
       {{network.name}}IpList: {get_attr: [{{role.name}}, ip_address]}
@@ -824,18 +824,22 @@ resources:
     # ServiceNetMap's attribute values are available.
     depends_on: ServiceNetMap
 
+{%- for role in roles %}
   # All Nodes Validations
-  AllNodesValidationConfig:
+  {{role.name}}AllNodesValidationConfig:
     type: OS::TripleO::AllNodes::Validation
     properties:
       PingTestIps:
         list_join:
         - ' '
         -
-{%- for network in networks if network.enabled|default(true) %}
+{%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
           - yaql:
               expression: coalesce($.data, []).first(null)
               data: {get_attr: [{{primary_role_name}}, {{network.name_lower}}_ip_address]}
+  {%- endif %}
+{%- endfor %}
 {%- endfor %}
 
   UpdateWorkflow:

puppet/role.role.j2.yaml

@@ -394,6 +394,7 @@ resources:
     type: OS::TripleO::{{role.name}}::NodeUserData
 
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
   {{network.name}}Port:
     type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port
     properties:
@@ -405,6 +406,7 @@ resources:
 {%- endif %}
           - {get_param: {{role.name}}IPs}
       NodeIndex: {get_param: NodeIndex}
+  {%- endif %}
   {%- endfor %}
 
   NetworkConfig:
@@ -412,7 +414,9 @@ resources:
     properties:
       ControlPlaneIp: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
       {{network.name}}IpSubnet: {get_attr: [{{network.name}}Port, ip_subnet]}
+  {%- endif %}
   {%- endfor %}
 
   NetIpMap:
@@ -420,9 +424,11 @@ resources:
     properties:
       ControlPlaneIp: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
       {{network.name}}Ip: {get_attr: [{{network.name}}Port, ip_address]}
       {{network.name}}IpSubnet: {get_attr: [{{network.name}}Port, ip_subnet]}
       {{network.name}}IpUri: {get_attr: [{{network.name}}Port, ip_address_uri]}
+  {%- endif %}
   {%- endfor %}
 
   NetHostMap:
@@ -431,6 +437,7 @@ resources:
       type: json
       value:
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
         {{network.name_lower}}:
           fqdn:
             list_join:
@@ -443,6 +450,7 @@ resources:
             - '.'
             - - {get_attr: [{{server_resource_name}}, name]}
               - {{network.name.lower()}}
+  {%- endif %}
   {%- endfor %}
         ctlplane:
           fqdn:
@@ -584,7 +592,9 @@ resources:
             tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
             tripleo::clouddomain: {get_param: CloudDomain}
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
             fqdn_{{network.name_lower}}: {get_attr: [NetHostMap, value, {{network.name_lower}}, fqdn]}
+  {%- endif %}
   {%- endfor %}
             fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
             fqdn_canonical: {get_attr: [NetHostMap, value, canonical, fqdn]}
@@ -675,7 +685,9 @@ resources:
         str_replace:
           template: "PRIMARYIP,PRIMARYHOST.DOMAIN,PRIMARYHOST,\
     {%- for network in networks %}
+    {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
   {{network.name}}IP,{{network.name}}HOST.DOMAIN,{{network.name}}HOST,\
+    {%- endif %}
     {%- endfor %}
   CTLPLANEIP,CTLPLANEHOST.DOMAIN,CTLPLANEHOST"
           params:
@@ -683,8 +695,10 @@ resources:
             DOMAIN: {get_param: CloudDomain}
             PRIMARYHOST: {get_attr: [{{server_resource_name}}, name]}
     {%- for network in networks %}
+    {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
             {{network.name}}IP: {get_attr: [{{network.name}}Port, ip_address]}
             {{network.name}}HOST: {get_attr: [NetHostMap, value, {{network.name_lower|default(network.name.lower())}}, short]}
+    {%- endif %}
     {%- endfor %}
             CTLPLANEIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
             CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
@@ -714,7 +728,9 @@ outputs:
     description: Mapping of network names to hostnames
     value:
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
       {{network.name_lower|default(network.name.lower())}}: {get_attr: [NetHostMap, value, {{network.name_lower|default(network.name.lower()) }}, fqdn]}
+  {%- endif %}
   {%- endfor %}
       ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
       canonical: {get_attr: [NetHostMap, value, canonical, fqdn]}
@@ -724,7 +740,9 @@ outputs:
         template: |
           PRIMARYIP PRIMARYHOST.DOMAIN PRIMARYHOST
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
           {{network.name}}IP {{network.name}}HOST.DOMAIN {{network.name}}HOST
+  {%- endif %}
   {%- endfor %}
           CTLPLANEIP CTLPLANEHOST.DOMAIN CTLPLANEHOST
         params:
@@ -732,8 +750,10 @@ outputs:
           DOMAIN: {get_param: CloudDomain}
           PRIMARYHOST: {get_attr: [{{server_resource_name}}, name]}
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
           {{network.name}}IP: {get_attr: [{{network.name}}Port, ip_address]}
           {{network.name}}HOST: {get_attr: [NetHostMap, value, {{network.name_lower|default(network.name.lower())}}, short]}
+  {%- endif %}
   {%- endfor %}
           CTLPLANEIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
           CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
@@ -807,7 +827,9 @@ outputs:
     description: The os-collect-config configuration associated with this server resource
     value: {get_attr: [{{server_resource_name}}, os_collect_config]}
   {%- for network in networks %}
+  {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
   {{network.name_lower|default(network.name.lower())}}_ip_address:
     description: IP address of the server in the {{network.name}} network
     value: {get_attr: [{{network.name}}Port, ip_address]}
+  {%- endif %}
   {%- endfor %}

roles/Undercloud.yaml

@@ -10,6 +10,12 @@
   tags:
     - primary
     - controller
+  networks:
+    - External
+    - InternalApi
+    - Storage
+    - StorageMgmt
+    - Tenant
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::Apache

roles_data_undercloud.yaml

@@ -13,6 +13,12 @@
   tags:
     - primary
     - controller
+  networks:
+    - External
+    - InternalApi
+    - Storage
+    - StorageMgmt
+    - Tenant
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::Apache