Merge https://github.com/cisagov/skeleton-ansible-role-with-test-user into lineage/skeleton

# Conflicts:
#	molecule/default/converge.yml

Author: mcdonnnj

.github/workflows/build.yml

@@ -278,12 +278,7 @@ jobs:
           sudo apt-get install apparmor-utils
           sudo aa-disable /usr/sbin/unix_chkpwd
         if: ${{ startsWith(matrix.platform, 'fedora') }}
-      - # This is an example of how to pass GHA secrets to Molecule
-        # via an environment variable.  See also
-        # molecule/default/converge.yml in this repository.
-        # env:
-        #   THIRD_PARTY_BUCKET: ${{ secrets.THIRD_PARTY_BUCKET }}
-        name: Run molecule tests
+      - name: Run molecule tests
         run: >-
           molecule test
           --platform-name ${{ matrix.platform }}-${{ matrix.architecture }}

molecule/default/converge.yml

@@ -2,6 +2,7 @@
 - name: Converge
   hosts: all
   tasks:
+<<<<<<< HEAD
     - name: Include ansible-role-ncats-webd
       # We do prepend the name of the role to the role variables, but
       # Molecule does its own role discovery with inconsistent naming.
@@ -11,3 +12,8 @@
       vars:
         ncats_webd_maxmind_account_id: "{{ lookup('aws_ssm', '/cyhy/core/geoip/account_id', region='us-east-1') }}"
         ncats_webd_maxmind_license_key: "{{ lookup('aws_ssm', '/cyhy/core/geoip/license_key', region='us-east-1') }}"
+=======
+    - name: Include skeleton-ansible-role-with-test-user
+      ansible.builtin.include_role:
+        name: skeleton-ansible-role-with-test-user
+>>>>>>> a0b442d4dd4bd70e2e23e1bb8de92d0c80bfff50