Update condition to include cloud-names.yaml

We are creating a new featureset064 that will deploy overcloud with
custom network + custom overcloud name + IPA integration.

For that new featureset, We don't want to add the default
file created from cloud-names.yaml.j2 template but instead use
the values we defined in ci tht templates[1] for custom networks.

Adding a var non_custom_network that defaults to true so that we
can override in fs064.

testproject: https://review.rdoproject.org/r/c/testproject/+/31954

[1] https://review.opendev.org/c/openstack/tripleo-heat-templates/+/812369

Change-Id: I4fec8997d3f74552b72a6e1a33258c684f683eff

roles/overcloud-deploy/defaults/main.yml

@@ -200,3 +200,9 @@ overcloud_selinux_enabled: >-
 
 network_data_yaml: "{{ overcloud_templates_path }}/ci/network_data.yaml"
 vip_data_yaml: "{{ overcloud_templates_path }}/ci/vip_data.yaml"
+
+# Use default network topology - InternalApi, StorageMgmt, Storage, tenant,
+# External. In featureset064: we set this as false as we don't want to
+# use the default cloud-names.yaml created from cloud-names.yaml.j2 and use
+# the values we defined in ci tht templates for custom networks.
+non_custom_network: true

roles/overcloud-deploy/tasks/create-scripts.yml

@@ -76,7 +76,7 @@
   when: baremetal_provision|bool and topology_map is defined
 
 - name: Cloud names heat environment
-  when: release not in ['mitaka', 'liberty']
+  when: non_custom_network|bool
   template:
     src: "cloud-names.yaml.j2"
     dest: "{{ working_dir }}/cloud-names.yaml"

roles/overcloud-deploy/tasks/pre-deploy.yml

@@ -151,7 +151,7 @@
   set_fact:
     cloud_name_args: >-
         -e {{ working_dir }}/cloud-names.yaml
-  when: release not in ['mitaka', 'liberty']
+  when: non_custom_network|bool
 
 - name: Set the hostname_map config if defined
   set_fact: