Update fields in line with review comments

EXAMPLE/group_vars/_skel/cluster_vars.yml

@@ -41,9 +41,9 @@ cluster_name: "{{app_name}}-{{buildenv}}"       # Identifies the cluster within
 #  type: &cloud_type "aws"
 #  image: "ami-0964eb2dc8b836eb6"    # eu-west-1, 18.04, amd64, hvm-ssd, 20200430.  Ubuntu images can be located at https://cloud-images.ubuntu.com/locator/
 #  region: &region "eu-west-1"       # eu-west-1, us-west-2
-#  dns_cloud_internal_domain: "{{_region}}.compute.internal"
-#  dns_nameserver_zone: &dns_nameserver_zone ""              # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
-#  dns_fqdn_domain: "{{_cloud_type}}-{{_region}}.{{app_class}}.{{buildenv}}.{{_dns_nameserver_zone}}"         # The _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
+#  dns_cloud_internal_domain: "{{_region}}.compute.internal"                       # The cloud-internal zone as defined by the cloud provider (e.g. GCP, AWS)
+#  dns_nameserver_zone: &dns_nameserver_zone ""                                    # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
+#  dns_user_domain: "{%- if _dns_nameserver_zone -%}MY.OTHER.PREFIXES.{{_dns_nameserver_zone}}{%- endif -%}"         # A user-defined _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
 #  dns_server: ""                    # Specify DNS server. nsupdate, route53 or clouddns.  If empty string is specified, no DNS will be added.
 #  route53_private_zone: true        # Only used when cluster_vars.type == 'aws'. Defaults to true if not set.
 #  assign_public_ip: "yes"
@@ -88,9 +88,9 @@ cluster_name: "{{app_name}}-{{buildenv}}"       # Identifies the cluster within
 #  type: &cloud_type "gcp"
 #  image: "projects/ubuntu-os-cloud/global/images/ubuntu-1804-bionic-v20200430"
 #  region: &region "europe-west1"
-#  dns_cloud_internal_domain: "c.{{gcp_credentials_json.project_id}}.internal"
-#  dns_nameserver_zone: &dns_nameserver_zone ""              # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
-#  dns_fqdn_domain: "{{_cloud_type}}-{{_region}}.{{app_class}}.{{buildenv}}.{{_dns_nameserver_zone}}"         # The _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
+#  dns_cloud_internal_domain: "c.{{gcp_credentials_json.project_id}}.internal"     # The cloud-internal zone as defined by the cloud provider (e.g. GCP, AWS)
+#  dns_nameserver_zone: &dns_nameserver_zone ""                                    # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
+#  dns_user_domain: "{%- if _dns_nameserver_zone -%}MY.OTHER.PREFIXES.{{_dns_nameserver_zone}}{%- endif -%}"         # A user-defined _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
 #  dns_server: ""                            # Specify DNS server. nsupdate, route53 or clouddns.  If empty string is specified, no DNS will be added.
 #  assign_public_ip: "yes"
 #  inventory_ip: "public"                    # 'public' or 'private', (private in case we're operating in a private LAN).  If public, 'assign_public_ip' must be 'yes'

EXAMPLE/group_vars/test_aws_euw1/cluster_vars.yml

@@ -40,9 +40,9 @@ cluster_vars:
   type: &cloud_type "aws"
   image: "ami-0964eb2dc8b836eb6"    # eu-west-1, 18.04, amd64, hvm-ssd, 20200430.  Ubuntu images can be located at https://cloud-images.ubuntu.com/locator/
   region: &region "eu-west-1"       # eu-west-1, us-west-2
-  dns_cloud_internal_domain: "{{_region}}.compute.internal"
-  dns_nameserver_zone: &dns_nameserver_zone ""              # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
-  dns_fqdn_domain: "{{_cloud_type}}-{{_region}}.{{app_class}}.{{buildenv}}.{{_dns_nameserver_zone}}"         # The _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
+  dns_cloud_internal_domain: "{{_region}}.compute.internal"   # The cloud-internal zone as defined by the cloud provider (e.g. GCP, AWS)
+  dns_nameserver_zone: &dns_nameserver_zone ""                # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
+  dns_user_domain: "{%- if _dns_nameserver_zone -%}{{_cloud_type}}-{{_region}}.{{app_class}}.{{buildenv}}.{{_dns_nameserver_zone}}{%- endif -%}"         # A user-defined _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
   dns_server: ""                    # Specify DNS server. nsupdate, route53 or clouddns.  If empty string is specified, no DNS will be added.
   route53_private_zone: true        # Only used when cluster_vars.type == 'aws'. Defaults to true if not set.
   assign_public_ip: "yes"

EXAMPLE/group_vars/test_gcp_euw1/cluster_vars.yml

@@ -44,9 +44,9 @@ cluster_vars:
   type: &cloud_type "gcp"
   image: "projects/ubuntu-os-cloud/global/images/ubuntu-1804-bionic-v20200430"
   region: &region "europe-west1"
-  dns_cloud_internal_domain: "c.{{gcp_credentials_json.project_id}}.internal"
-  dns_nameserver_zone: &dns_nameserver_zone ""              # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
-  dns_fqdn_domain: "{{_cloud_type}}-{{_region}}.{{app_class}}.{{buildenv}}.{{_dns_nameserver_zone}}"         # The _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
+  dns_cloud_internal_domain: "c.{{gcp_credentials_json.project_id}}.internal"   # The cloud-internal zone as defined by the cloud provider (e.g. GCP, AWS)
+  dns_nameserver_zone: &dns_nameserver_zone ""                                  # The zone that dns_server will operate on.  gcloud dns needs a trailing '.'.  Leave blank if no external DNS (use IPs only)
+  dns_user_domain: "{%- if _dns_nameserver_zone -%}{{_cloud_type}}-{{_region}}.{{app_class}}.{{buildenv}}.{{_dns_nameserver_zone}}{%- endif -%}"         # A user-defined _domain_ part of the FDQN, (if more prefixes are required before the dns_nameserver_zone)
   dns_server: ""                            # Specify DNS server. nsupdate, route53 or clouddns.  If empty string is specified, no DNS will be added.
   assign_public_ip: "yes"
   inventory_ip: "public"                    # 'public' or 'private', (private in case we're operating in a private LAN).  If public, 'assign_public_ip' must be 'yes'

clean/tasks/clean_dns.yml

@@ -13,7 +13,7 @@
             server: "{{bind9[buildenv].server}}"
             zone: "{{cluster_vars.dns_nameserver_zone}}"
             state: "absent"
-            record: "{{item.name}}.{{cluster_vars.dns_fqdn_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
+            record: "{{item.name}}.{{cluster_vars.dns_user_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
           with_items: "{{ hosts_to_clean }}"
 
         - name: clean/dns/nsupdate | Delete CNAME records
@@ -22,15 +22,15 @@
             key_secret: "{{bind9[buildenv].key_secret}}"
             server: "{{bind9[buildenv].server}}"
             zone: "{{cluster_vars.dns_nameserver_zone}}"
-            record: "{{item.name | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_fqdn_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
-            value:  "{{item.name}}.{{cluster_vars.dns_fqdn_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
+            record: "{{item.name | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_user_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
+            value:  "{{item.name}}.{{cluster_vars.dns_user_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
             type: CNAME
             state: absent
           with_items: "{{ hosts_to_clean }}"
           vars:
-            cname_to_check: "{{ item.name | regex_replace('-(?!.*-).*') }}.{{cluster_vars.dns_fqdn_domain}}."
+            cname_to_check: "{{ item.name | regex_replace('-(?!.*-).*') }}.{{cluster_vars.dns_user_domain}}."
             cname_value: "{{ lookup('dig', cname_to_check, 'qtype=CNAME', '@'+bind9[buildenv].server) }}"
-          when: (item.name + '.' + cluster_vars.dns_fqdn_domain + "." == cname_value)
+          when: (item.name + '.' + cluster_vars.dns_user_domain + "." == cname_value)
       when: cluster_vars.dns_server == "nsupdate"
 
     - name: clean/dns/route53 | Delete DNS entries from route53
@@ -41,7 +41,7 @@
             aws_secret_key: "{{cluster_vars[buildenv].aws_secret_key}}"
             state: "get"
             zone: "{{cluster_vars.dns_nameserver_zone}}"
-            record: "{{item.name}}.{{cluster_vars.dns_fqdn_domain}}"
+            record: "{{item.name}}.{{cluster_vars.dns_user_domain}}"
             type: "A"
             private_zone: "{{cluster_vars.route53_private_zone | default(true)}}"
           register: r__route53_a
@@ -67,7 +67,7 @@
             aws_secret_key: "{{cluster_vars[buildenv].aws_secret_key}}"
             state: "get"
             zone: "{{cluster_vars.dns_nameserver_zone}}"
-            record: "{{item.name | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_fqdn_domain}}"
+            record: "{{item.name | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_user_domain}}"
             type: "CNAME"
             private_zone: "{{cluster_vars.route53_private_zone | default(true)}}"
           register: r__route53_cname

clean/tasks/main.yml

@@ -4,7 +4,7 @@
   block:
     - name: clean | Delete DNS
       include_tasks: clean_dns.yml
-      when: (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_nameserver_zone is defined and cluster_vars.dns_nameserver_zone != "")
+      when: (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_user_domain is defined and cluster_vars.dns_user_domain != "")
 
     - name: clean | Delete VMs
       include_tasks: clean_vms.yml

config/tasks/create_dns_a.yml

@@ -7,7 +7,7 @@
     server: "{{bind9[buildenv].server}}"
     ttl: 60
     zone: "{{cluster_vars.dns_nameserver_zone}}"
-    record: "{{item.hostname}}.{{cluster_vars.dns_fqdn_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
+    record: "{{item.hostname}}.{{cluster_vars.dns_user_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
     value: "{{ hostvars[item.hostname]['ansible_host'] }}"
   become: false
   delegate_to: localhost
@@ -21,7 +21,7 @@
     aws_secret_key: "{{cluster_vars[buildenv].aws_secret_key}}"
     state: present
     zone: "{{cluster_vars.dns_nameserver_zone}}"
-    record: "{{item.hostname}}.{{cluster_vars.dns_fqdn_domain}}"
+    record: "{{item.hostname}}.{{cluster_vars.dns_user_domain}}"
     type: A
     ttl: 60
     value: "{{ hostvars[item.hostname]['ansible_host'] }}"
@@ -52,7 +52,7 @@
         managed_zone:
           name: "{{r__gcp_dns_managed_zone_info.resources.0.name}}"
           dnsName: "{{r__gcp_dns_managed_zone_info.resources.0.dnsName}}"
-        name: "{{item.hostname}}.{{cluster_vars.dns_fqdn_domain}}"
+        name: "{{item.hostname}}.{{cluster_vars.dns_user_domain}}"
         project: "{{cluster_vars.project_id}}"
         service_account_file: "{{gcp_credentials_file}}"
         state: present
@@ -86,7 +86,7 @@
       delay: 10
       with_items: "{{ cluster_hosts_target }}"
       vars:
-        new_fqdn: "{{item.hostname}}.{{cluster_vars.dns_fqdn_domain | regex_replace('^(.*?)\\.?$','\\1')}}."      # Add a '.' to the fadn, (but only if there's not one already)
+        new_fqdn: "{{item.hostname}}.{{cluster_vars.dns_user_domain | regex_replace('^(.*?)\\.?$','\\1')}}."      # Add a '.' to the fadn, (but only if there's not one already)
         new_ip: "{{hostvars[item.hostname].ansible_host}}"
       become: false
       run_once: true

config/tasks/main.yml

@@ -39,7 +39,7 @@
   lineinfile:
     path: /etc/hosts
     regexp: '^{{ansible_default_ipv4.address}}'
-    line: '{{ansible_default_ipv4.address}} {{inventory_hostname}}.{{cluster_vars.dns_fqdn_domain}} {{inventory_hostname}}'
+    line: '{{ansible_default_ipv4.address}} {{inventory_hostname}}.{{cluster_vars.dns_user_domain}} {{inventory_hostname}}'
 #    regexp: '^127\.0\.1\.1'
 #    line: '127.0.1.1 {{inventory_hostname}}'
     insertbefore: "BOF"
@@ -91,4 +91,4 @@
 
 - name: create DNS A records
   include_tasks: create_dns_a.yml
-  when: (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_nameserver_zone is defined and cluster_vars.dns_nameserver_zone != "")
+  when: (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_user_domain is defined and cluster_vars.dns_user_domain != "")

readiness/tasks/config_dns_cname.yml

@@ -6,8 +6,8 @@
     key_secret: "{{bind9[buildenv].key_secret}}"
     server: "{{bind9[buildenv].server}}"
     zone: "{{cluster_vars.dns_nameserver_zone}}"
-    record: "{{item.hostname | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_fqdn_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
-    value:  "{{item.hostname}}.{{cluster_vars.dns_fqdn_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
+    record: "{{item.hostname | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_user_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
+    value:  "{{item.hostname}}.{{cluster_vars.dns_user_domain | regex_replace('^(.*?)\\.' + cluster_vars.dns_nameserver_zone, '\\1')}}"
     type: CNAME
     state: present
     ttl: 30
@@ -22,10 +22,10 @@
     aws_secret_key: "{{cluster_vars[buildenv].aws_secret_key}}"
     state: present
     zone: "{{cluster_vars.dns_nameserver_zone}}"
-    record: "{{item.hostname | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_fqdn_domain}}"
+    record: "{{item.hostname | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_user_domain}}"
     type: CNAME
     ttl: 30
-    value: "{{item.hostname}}.{{cluster_vars.dns_fqdn_domain}}"
+    value: "{{item.hostname}}.{{cluster_vars.dns_user_domain}}"
     private_zone: "{{cluster_vars.route53_private_zone | default(true)}}"
     overwrite: true
   with_items: "{{ cluster_hosts_target }}"
@@ -53,11 +53,11 @@
         managed_zone:
           name: "{{gcp_dns_managed_zone_info.resources.0.name}}"
           dnsName: "{{gcp_dns_managed_zone_info.resources.0.dnsName}}"
-        name: "{{item.hostname | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_fqdn_domain}}"
+        name: "{{item.hostname | regex_replace('-(?!.*-).*')}}.{{cluster_vars.dns_user_domain}}"
         project: "{{cluster_vars.project_id}}"
         service_account_file: "{{gcp_credentials_file}}"
         state: present
-        target: "{{item.hostname}}.{{cluster_vars.dns_fqdn_domain}}"
+        target: "{{item.hostname}}.{{cluster_vars.dns_user_domain}}"
         type: CNAME
         ttl: 60
       with_items: "{{ cluster_hosts_target }}"

readiness/tasks/main.yml

@@ -6,4 +6,4 @@
 
 - name: readiness | create/update DNS CNAME records
   include_tasks: config_dns_cname.yml
-  when: (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_nameserver_zone is defined and cluster_vars.dns_nameserver_zone != "")
+  when: (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_user_domain is defined and cluster_vars.dns_user_domain != "")

redeploy/_scheme_addallnew_rmdisk_rollback/tasks/main.yml

@@ -28,7 +28,7 @@
     - import_role:
         name: clusterverse/clean
         tasks_from: clean_dns.yml
-      when: (hosts_to_clean | length)  and  (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_nameserver_zone is defined and cluster_vars.dns_nameserver_zone != "")
+      when: (hosts_to_clean | length)  and  (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_user_domain is defined and cluster_vars.dns_user_domain != "")
 
     - import_role:
         name: clusterverse/clean

redeploy/_scheme_addnewvm_rmdisk_rollback/tasks/main.yml

@@ -72,7 +72,7 @@
     - import_role:
         name: clusterverse/clean
         tasks_from: clean_dns.yml
-      when: (hosts_to_clean | length)  and  (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_nameserver_zone is defined and cluster_vars.dns_nameserver_zone != "")
+      when: (hosts_to_clean | length)  and  (cluster_vars.dns_server is defined and cluster_vars.dns_server != "") and (cluster_vars.dns_user_domain is defined and cluster_vars.dns_user_domain != "")
 
     - import_role:
         name: clusterverse/clean