Update route53 dns tasks

roles/lib_utils/filter_plugins/oo_filters.py

@@ -668,6 +668,20 @@ def lib_utils_oo_oreg_image(image_default, oreg_url):
     return '/'.join([oreg_parts[0], image_parts[1], image_parts[2]])
 
 
+def lib_utils_oo_list_of_dict_to_dict_from_key(input_list, keyname):
+    '''Converts a list of dictionaries to a dictionary with keyname: dictionary
+
+       Example input: [{'name': 'first', 'url': 'x.com'}, {'name': 'second', 'url': 'y.com'}],
+                      'name'
+       Example output: {'first': {'url': 'x.com', 'name': 'first'}, 'second': {'url': 'y.com', 'name': 'second'}}'''
+    output_dict = {}
+    for item in input_list:
+        retrieved_val = item.get(keyname)
+        if keyname is not None:
+            output_dict[retrieved_val] = item
+    return output_dict
+
+
 class FilterModule(object):
     """ Custom ansible filter mapping """
 
@@ -701,4 +715,5 @@ class FilterModule(object):
             "lib_utils_oo_etcd_host_urls": lib_utils_oo_etcd_host_urls,
             "lib_utils_mutate_htpass_provider": lib_utils_mutate_htpass_provider,
             "lib_utils_oo_oreg_image": lib_utils_oo_oreg_image,
+            "lib_utils_oo_list_of_dict_to_dict_from_key": lib_utils_oo_list_of_dict_to_dict_from_key,
         }

roles/openshift_aws/defaults/main.yml

@@ -66,42 +66,51 @@ openshift_aws_dns_provider: "route53"
 # openshift_aws_dns_zone: ""
 # ie. openshift_aws_dns_zone: "{{ openshift_aws_clusterid }}.example.com"
 
+# elb names we want to query to support dns record creation.
+# you don't need to adjust this unless you have modified openshift_aws_elb_dict
+openshift_aws_elb_names:
+- "{{ openshift_aws_elb_master_internal_name }}"
+- "{{ openshift_aws_elb_master_external_name }}"
+- "{{ openshift_aws_elb_infra_name }}"
+
+# l_openshift_aws_elb_facts is created by querying ec2 for all elb names in
+# l_openshift_aws_elb_names via tasks/build_elb_dict.yml
 openshift_aws_dns_records:
-# Pertains to inventory file key: openshift_master_cluster_public_hostname
-- record: 'api'
-  elb_name: "{{ openshift_aws_elb_dict['master']['external']['name'] }}"
-  type: 'CNAME'
-  kind: 'elb'
-  private_zone: False
-# Pertains to inventory file key: openshift_master_cluster_hostname
-- record: 'internal.api'
-  elb_name: "{{ openshift_aws_elb_dict['master']['internal']['name'] }}"
-  type: 'CNAME'
-  kind: 'elb'
-  private_zone: False
-# Pertains to inventory file key: openshift_master_default_subdomain
-- record: '*.apps'
-  elb_name: "{{ openshift_aws_elb_dict['infra']['external']['name'] }}"
-  type: "CNAME"
-  kind: "elb"
-  private_zone: False
-- record: 'logs'
-  elb_name: "{{ openshift_aws_elb_dict['infra']['external']['name'] }}"
-  type: "CNAME"
-  kind: "elb"
-  private_zone: False
-- record: 'metrics'
-  elb_name: "{{ openshift_aws_elb_dict['infra']['external']['name'] }}"
-  type: "CNAME"
-  kind: "elb"
-  private_zone: False
-- record: 'registry'
-  elb_name: "{{ openshift_aws_elb_dict['infra']['external']['name'] }}"
-  type: "CNAME"
-  kind: "elb"
-  private_zone: False
-# A public or private vpc attached Route53 zone will be created based on
-# private_zone boolean.  Split-tier dns is supported.
+  # Pertains to inventory file key: openshift_master_cluster_public_hostname
+  'api':
+    type: 'CNAME'
+    # A public or private vpc attached Route53 zone will be created based on
+    # private_zone boolean.  Split-tier dns is supported.
+    private_zone: False
+    value: "{{ l_openshift_aws_elb_facts[openshift_aws_elb_master_external_name].dns_name }}"
+  # Pertains to inventory file key: openshift_master_cluster_hostname
+  'internal.api':
+    type: 'CNAME'
+    private_zone: False
+    value: "{{ l_openshift_aws_elb_facts[openshift_aws_elb_master_internal_name].dns_name }}"
+  # Pertains to inventory file key: openshift_master_default_subdomain
+  '*.apps':
+    type: "CNAME"
+    private_zone: False
+    value: "{{ l_openshift_aws_elb_facts[openshift_aws_elb_infra_name].dns_name }}"
+  'logs':
+    type: "CNAME"
+    private_zone: False
+    value: "{{ l_openshift_aws_elb_facts[openshift_aws_elb_infra_name].dns_name }}"
+  'metrics':
+    type: "CNAME"
+    private_zone: False
+    value: "{{ l_openshift_aws_elb_facts[openshift_aws_elb_infra_name].dns_name }}"
+  'registry':
+    type: "CNAME"
+    private_zone: False
+    value: "{{ l_openshift_aws_elb_facts[openshift_aws_elb_infra_name].dns_name }}"
+
+# Allows users to add and recursively override
+# https://docs.ansible.com/ansible/2.5/user_guide/playbooks_filters.html#combining-hashes-dictionaries
+openshift_aws_dns_records_override: {}
+
+l_openshift_aws_dns_records: "{{ openshift_aws_dns_records | combine(openshift_aws_dns_records_override, recursive=True) }}"
 
 openshift_aws_elb_basename: "{{ openshift_aws_clusterid }}"
 openshift_aws_elb_master_external_name: "{{ openshift_aws_elb_basename }}-master-external"

roles/openshift_aws/tasks/build_elb_dict.yml

@@ -0,0 +1,12 @@
+---
+- name: querying elb
+  ec2_elb_facts:
+    names: "{{ openshift_aws_elb_names | join(',') }}"
+    region: "{{ openshift_aws_region }}"
+  register: elb_res
+
+# lib_utils_oo_list_of_dict_to_dict_from_key is a custom filter in
+# roles/lib_utils/filters/oo_filters.py
+- name: set elb fact dictionary
+  set_fact:
+    l_openshift_aws_elb_facts: "{{ elb_res | lib_utils_oo_list_of_dict_to_dict_from_key('name')}}"

roles/openshift_aws/tasks/dns.yml

@@ -1,6 +1,15 @@
 ---
 - import_tasks: vpc_and_subnet_id.yml
 
+- import_tasks: build_elb_dict.yml
+
 - name: provision route53
   import_tasks: dns_route53.yml
-  when: "'route53' in openshift_aws_dns_provider"
+  when: "openshift_aws_dns_provider == 'route53'"
+
+- name: provision custom dns
+  include_role:
+    name: "{{ openshift_aws_custom_dns_provider_role }}"
+    tasks_from: "{{ openshift_aws_custom_provider_role_tasks | default('main.yml') }}"
+  when:
+  - openshift_aws_custom_dns_provider_role is defined

roles/openshift_aws/tasks/dns_route53.yml

@@ -3,15 +3,29 @@
   route53_zone:
     comment: "{{ openshift_aws_dns_zone }}"
     state: present
-    vpc_id: "{{ ( l_openshift_aws_route53_scheme | ternary(vpcout.vpcs.0.id, '') ) }}"
+    vpc_id: "{{ item }}"
     vpc_region: "{{ openshift_aws_region }}"
     zone: "{{ openshift_aws_dns_zone }}"
-  loop: "{{ openshift_aws_dns_records | selectattr('private_zone','defined') | map(attribute='private_zone') | list | unique  }}"
-  loop_control:
-    loop_var: l_openshift_aws_route53_scheme
+  with_items: "{{ l_zone_items }}"
+  vars:
+    # for each item in openshift_aws_dns_records, determine value of private_zone (false if unset), map to list
+    l_pz_list: "{{ openshift_aws_dns_records | list | map('extract', openshift_aws_dns_records, 'private_zone') | map('bool') | list }}"
+    l_pz_add_private: "{{ (True in l_pz_list) | ternary([vpcout.vpcs.0.id], []) }}"
+    l_pz_add_public: "{{ (False in l_pz_list) | ternary([''], []) }}"
+    # This will add '' if there are any private_zone: No records, and will add
+    # vpcout.vpcs.0.id if there are any private_zone: Yes records.
+    l_zone_items: "{{ [] + l_pz_add_public + l_pz_add_private }}"
 
-- name: creating route53 record(s)
-  include_task: dns_route53_record.yml
-  with_items: "{{ openshift_aws_dns_records }}"
+- name: creating record
+  route53:
+    command: create
+    overwrite: no
+    private_zone: "{{ l_openshift_aws_dns_element.value['private_zone'] | bool }}"
+    record: "{{ l_openshift_aws_dns_element.key }}.{{ openshift_aws_dns_zone }}"
+    type: "{{ l_openshift_aws_dns_element.value['type'] }}"
+    ttl: 300
+    value: "{{ l_openshift_aws_dns_element.value['value'] }}"
+    zone: "{{ openshift_aws_dns_zone }}"
+  with_dict: "{{ l_openshift_aws_dns_records }}"
   loop_control:
     loop_var: l_openshift_aws_dns_element

roles/openshift_aws/tasks/dns_route53_record.yml

@@ -1,22 +0,0 @@
----
-- debug: msg="{{ l_openshift_aws_dns_element }}"
-
-- name: querying elb
-  ec2_elb_facts:
-    names: "{{ l_openshift_aws_dns_element['elb_name'] }}"
-    region: "{{ openshift_aws_region }}"
-  register: elb_facts
-  when:
-    - "l_openshift_aws_dns_element.kind == 'elb'"
-    - "l_openshift_aws_dns_element.type == 'CNAME'"
-
-- name: creating record
-  route53:
-    command: create
-    overwrite: no
-    private_zone: "{{ l_openshift_aws_dns_element['private_zone'] }}"
-    record: "{{ l_openshift_aws_dns_element['record'] }}.{{ openshift_aws_dns_zone }}"
-    type: "{{ l_openshift_aws_dns_element['type'] }}"
-    ttl: 300
-    value: "{{ elb_facts.elbs[0].dns_name }}"
-    zone: "{{ openshift_aws_dns_zone }}"