Add selectable distribution support for cloudera.cluster (#51)

Signed-off-by: Daniel Chaffelson <chaffelson@gmail.com>

Author: Chaffelson

docs/configuration.yml

@@ -182,6 +182,7 @@ globals:
   dynamic_inventory:
     vm:
       count:
+      os:
   gcloud_credential_file:
   infra_type:
   labels:
@@ -277,7 +278,6 @@ infra:
     tag_key:
     tag_value:
     vm:
-      os:
       suffix:
       type:
   gcp:

roles/infrastructure/defaults/main.yml

@@ -34,8 +34,8 @@ infra__public_endpoint_access:      "{{ common__public_endpoint_access }}"
 # Dynamic Inventory for Clusters
 infra__private_key_file:                 "{{ globals.ssh.private_key_file | default('') }}"
 infra__dynamic_inventory_count:          "{{ globals.dynamic_inventory.vm.count | default(0) }}"
+infra__dynamic_inventory_os:             "{{ globals.dynamic_inventory.vm.os | default('el7') }}"
 infra__dynamic_inventory_vm_suffix:      "{{ infra.dynamic_inventory.vm.suffix | default('vm') }}"
-infra__dynamic_inventory_os:             "{{ infra.dynamic_inventory.vm.os | default('centos7') }}"
 infra__dynamic_inventory_vm_type:        "{{ infra.dynamic_inventory.vm.type | default('std') }}"
 infra__dynamic_inventory_storage_type:   "{{ infra.dynamic_inventory.storage.type | default('std') }}"
 infra__dynamic_inventory_storage_size:   "{{ infra.dynamic_inventory.storage.size | default('200') }}"

roles/infrastructure/tasks/setup_aws_compute.yml

@@ -34,10 +34,10 @@
         volume_size: "{{ infra__dynamic_inventory_storage_size }}"
         delete_on_termination: "{{ infra__dynamic_inventory_delete_storage }}"
     wait: yes
-    instance_tags: "{{ infra__dynamic_inventory_tags | combine( {'Name': '-'.join([infra__namespace, infra__dynamic_inventory_vm_suffix, '%02d' | format(__infra_compute_instance_item)]) }) }}"
+    instance_tags: "{{ infra__dynamic_inventory_tags | combine( {'Name': '-'.join([infra__namespace, infra__dynamic_inventory_vm_suffix, infra__dynamic_inventory_os[::2], '%02d' | format(__infra_compute_instance_item)]) }) }}"
     exact_count: 1
     count_tag:
-      Name: "{{ '-'.join([infra__namespace, infra__dynamic_inventory_vm_suffix, '%02d' | format(__infra_compute_instance_item)]) }}"
+      Name: "{{ '-'.join([infra__namespace, infra__dynamic_inventory_vm_suffix, infra__dynamic_inventory_os[::2], '%02d' | format(__infra_compute_instance_item)]) }}"
     vpc_subnet_id: "{{ infra__aws_subnet_ids | first }}"
     assign_public_ip: yes
 

roles/infrastructure/vars/main.yml

@@ -28,16 +28,21 @@ infra__cdp_control_plane_cidr_default:  ['52.36.110.208/32', '52.40.165.49/32',
 
 infra__dynamic_inventory_images_default:
   aws:
-    centos7:
+    el7:
       search: 'CentOS Linux 7 x86_64 HVM EBS*'
       user: 'centos'
       owners:
         - 'aws-marketplace'
-    centos8:
+    el8:
       search: 'CentOS 8.2*x86*'
       user: 'centos'
       owners:
         - '125523088429'
+    bionic:
+      search: 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server*'
+      user: 'ubuntu'
+      owners:
+        - '099720109477'
 
 infra__all_ports_security_rule:
   aws: -1