Merge branch 'main' into jce/multi-arch-ee

common/setup.yml

@@ -44,13 +44,14 @@ controller_inventory_sources:
         - tag:Name
       compose:
         ansible_host: public_ip_address
-        ansible_user: ec2-user
+        ansible_user: 'ec2-user'
       groups:
         cloud_aws: true
-        os_linux: "platform_details == 'Red Hat Enterprise Linux'"
-        os_windows: "platform_details == 'Windows'"
-
+        os_linux: tags.blueprint.startswith('rhel')
+        os_windows: tags.blueprint.startswith('win')
       keyed_groups:
+        - key: platform
+          prefix: os
         - key: tags.blueprint
           prefix: blueprint
         - key: tags.owner
@@ -61,7 +62,6 @@ controller_inventory_sources:
           prefix: deployment
         - key: tags.Compliance
           separator: ''
-
 controller_groups:
   - name: cloud_aws
     inventory: Demo Inventory

linux/multi_profile_compliance_report.yml

@@ -52,9 +52,7 @@
             state: enabled
             immediate: true
             permanent: true
-          when:
-            - "'firewalld.service' in ansible_facts.services"
-            - ansible_facts.services["firewalld.service"].state == "running"
+          when: "'firewalld.service' in ansible_facts.services"
 
         - name: Disable httpd welcome page
           ansible.builtin.file:

windows/create_ad_domain.yml

@@ -46,17 +46,15 @@
     - name: Create some users
       microsoft.ad.user:
         name: "{{ item.name }}"
-        groups:
-          set:
-            - "{{ item.group }}"
+        groups: "{{ item.groups }}"
         password: "{{ lookup('community.general.random_string', min_lower=1, min_upper=1, min_special=1, min_numeric=1) }}"
         update_password: on_create
       loop:
         - name: "UserA"
-          group: "GroupA"
+          groups: "GroupA"
         - name: "UserB"
-          group: "GroupB"
+          groups: "GroupB"
         - name: "UserC"
-          group: "GroupC"
+          groups: "GroupC"
       retries: 5
       delay: 10