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

# Conflicts:
#	molecule/default/converge.yml
#	terraform/user.tf

Author: jsf9k

molecule/default/converge.yml

@@ -10,4 +10,13 @@
         cdm_certificates_third_party_bucket_name: "{{ lookup('env', 'THIRD_PARTY_BUCKET') }}"
 =======
         name: skeleton-ansible-role-with-test-user
+<<<<<<< HEAD
 >>>>>>> a0b442d4dd4bd70e2e23e1bb8de92d0c80bfff50
+=======
+      # This is an example of passing role vars via AWS SSM Parameter
+      # Store parameters.  In particular, roles that require access to
+      # resources inside the third-party bucket will likely need the
+      # name of that bucket passed in.
+      # vars:
+      #   skeleton_bucket_name: "{{ lookup('aws_ssm', '/third_party_bucket_name') }}"
+>>>>>>> c6cde4806487cc7ebff7376aa53cd34f9b1a6adc

terraform/user.tf

@@ -8,5 +8,14 @@ module "user" {
     aws.images-ssm              = aws.images_ssm
   }
 
+<<<<<<< HEAD
   entity = "ansible-role-cdm-certificates"
+=======
+  entity = "skeleton-ansible-role-with-test-user"
+  # If necessary, provide a list of SSM Parameter Store parameters that the test user needs to
+  # be able to read.  In particular, roles that require access to
+  # resources inside the third-party bucket will likely need to access the
+  # name of that bucket via such a parameter.
+  # ssm_parameters = ["/third_party_bucket_name"]
+>>>>>>> c6cde4806487cc7ebff7376aa53cd34f9b1a6adc
 }