Skip to content

Commit eedc2d6

Browse files
author
jsf9k
committed
# Conflicts: # molecule/default/converge.yml # terraform/user.tf
2 parents 726f8dc + c6cde48 commit eedc2d6

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

molecule/default/converge.yml

+9
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,13 @@
1616
- name: Include skeleton-ansible-role-with-test-user
1717
ansible.builtin.include_role:
1818
name: skeleton-ansible-role-with-test-user
19+
<<<<<<< HEAD
1920
>>>>>>> a0b442d4dd4bd70e2e23e1bb8de92d0c80bfff50
21+
=======
22+
# This is an example of passing role vars via AWS SSM Parameter
23+
# Store parameters. In particular, roles that require access to
24+
# resources inside the third-party bucket will likely need the
25+
# name of that bucket passed in.
26+
# vars:
27+
# skeleton_bucket_name: "{{ lookup('aws_ssm', '/third_party_bucket_name') }}"
28+
>>>>>>> c6cde4806487cc7ebff7376aa53cd34f9b1a6adc

terraform/user.tf

+9
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,18 @@ module "user" {
88
aws.images-ssm = aws.images_ssm
99
}
1010

11+
<<<<<<< HEAD
1112
entity = "ansible-role-ncats-webd"
1213
ssm_parameters = [
1314
"/cyhy/core/geoip/account_id",
1415
"/cyhy/core/geoip/license_key",
1516
]
17+
=======
18+
entity = "skeleton-ansible-role-with-test-user"
19+
# If necessary, provide a list of SSM Parameter Store parameters that the test user needs to
20+
# be able to read. In particular, roles that require access to
21+
# resources inside the third-party bucket will likely need to access the
22+
# name of that bucket via such a parameter.
23+
# ssm_parameters = ["/third_party_bucket_name"]
24+
>>>>>>> c6cde4806487cc7ebff7376aa53cd34f9b1a6adc
1625
}

0 commit comments

Comments
 (0)