Discover blockdevices and securitygroups for greater compatibility

Author: Martin Jackson

ansible/deploy_kubevirt_worker.yml

@@ -7,11 +7,6 @@
   gather_facts: false
   vars:
     kubeconfig: "{{ lookup('env', 'KUBECONFIG') }}"
-    machineset_blockdevices:
-      - ebs:
-          iops: 0
-          volumeSize: 120
-          volumeType: gp2
     machineset_instance_type: m5.metal
     machineset_machine_role: worker
     machineset_machine_type: worker
@@ -47,6 +42,8 @@
         machineset_ami_id: "{{ cluster_machinesets.resources[0].spec.template.spec.providerSpec.value.ami.id }}"
         machineset_subnet: "{{ cluster_machinesets.resources[0].spec.template.spec.providerSpec.value.subnet.filters[0]['values'][0] }}"
         machineset_tags: "{{ cluster_machinesets.resources[0].spec.template.spec.providerSpec.value.tags }}"
+        machineset_blockdevices: "{{ cluster_machinesets.resources[0].spec.template.spec.providerSpec.value.blockDevices }}"
+        machineset_securitygroups: "{{ cluster_machinesets.resources[0].spec.template.spec.providerSpec.value.securityGroups }}"
         machineset_zone: "{{ cluster_machinesets.resources[0].spec.template.spec.providerSpec.value.placement.availabilityZone }}"
         infrastructure_name: "{{ cluster_info.resources[0].status.infrastructureName }}"
         infrastructure_region: "{{ cluster_info.resources[0].status.platformStatus.aws.region }}"
@@ -97,11 +94,7 @@
                     placement:
                       availabilityZone: "{{ machineset_zone }}"
                       region: "{{ infrastructure_region }}"
-                    securityGroups:
-                      - filters:
-                          - name: tag:Name
-                            values:
-                              - "{{ infrastructure_name }}-worker-sg"
+                    securityGroups: {{ machineset_securitygroups }}
                     subnet:
                       filters:
                         - name: tag:Name