From 215c2d61b173952da386dded9c5943b66799af4a Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 13 Sep 2024 11:06:49 -0400 Subject: [PATCH 1/7] Bump version from 1.0.0 to 1.0.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 5becc17..5c4105c 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.0.0" +__version__ = "1.0.1" From 48c6c941084bb12439d86360d32306c712acb1ef Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 13 Sep 2024 11:07:24 -0400 Subject: [PATCH 2/7] Bump version from 1.0.1 to 1.0.1-rc.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 5c4105c..b473b97 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.0.1" +__version__ = "1.0.1-rc.1" From 2e9c97a623a647674b719d7cb38e892e8aab602b Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 13 Sep 2024 11:07:33 -0400 Subject: [PATCH 3/7] Add ansible as as dependency for the ansible-lint pre-commit hook This is necessary because the community.general collection is listed as a dependency in src/requirements.yml. --- .pre-commit-config.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5a5000f..af745d2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -173,7 +173,10 @@ repos: # necessary to add the ansible package itself as an # additional dependency, with the same pinning as is done in # requirements-test.txt of cisagov/skeleton-ansible-role. - # - ansible>=9,<10 + # + # community.general is a dependency in src/requirements.txt + # for this repo. + - ansible>=9,<10 # ansible-core 2.16.3 through 2.16.6 suffer from the bug # discussed in ansible/ansible#82702, which breaks any # symlinked files in vars, tasks, etc. for any Ansible role From 00208334beb3063ad0d2f38221e09bbb461bbee8 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 13 Sep 2024 11:09:00 -0400 Subject: [PATCH 4/7] Add back in cisagov/ansible-role-amazon-ssm-agent The role supports the installation of amazon-ssm-agent via snap on Ubuntu with the merging of cisagov/ansible-role-amazon-ssm-agent#57. --- src/aws.yml | 7 +++---- src/requirements.yml | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/aws.yml b/src/aws.yml index d6bf6a8..0bff897 100644 --- a/src/aws.yml +++ b/src/aws.yml @@ -4,10 +4,9 @@ become: true become_method: ansible.builtin.sudo tasks: - # This agent is already installed on the Ubuntu base AMI. - # - name: Install Amazon SSM Agent - # ansible.builtin.include_role: - # name: amazon_ssm_agent + - name: Install Amazon SSM Agent + ansible.builtin.include_role: + name: amazon_ssm_agent - name: Install chrony and configure it for use within AWS ansible.builtin.include_role: name: chrony_aws diff --git a/src/requirements.yml b/src/requirements.yml index 8fdf3ad..306f7e5 100644 --- a/src/requirements.yml +++ b/src/requirements.yml @@ -2,9 +2,8 @@ collections: - community.general roles: -# This agent is already installed on the Ubuntu base AMI. -# - name: amazon_ssm_agent -# src: https://github.com/cisagov/ansible-role-amazon-ssm-agent + - name: amazon_ssm_agent + src: https://github.com/cisagov/ansible-role-amazon-ssm-agent - name: automated_security_updates src: https://github.com/cisagov/ansible-role-automated-security-updates - name: banner From b6792bffd5245d7bd711b22fa06fec0aa4d594f5 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 13 Sep 2024 13:12:16 -0400 Subject: [PATCH 5/7] Temporarily use a non-default branch of cisagov/ansible-role-amazon-ssm-agent This is being done for testing purposes and this change can be reverted once cisagov/ansible-role-amazon-ssm-agent#57 is merged. --- src/requirements.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/requirements.yml b/src/requirements.yml index 306f7e5..819129a 100644 --- a/src/requirements.yml +++ b/src/requirements.yml @@ -4,6 +4,7 @@ collections: roles: - name: amazon_ssm_agent src: https://github.com/cisagov/ansible-role-amazon-ssm-agent + version: bugfix/install-via-snap-on-ubuntu - name: automated_security_updates src: https://github.com/cisagov/ansible-role-automated-security-updates - name: banner From 6d98d6c68998f10fbaeb6cced55113d4d5cef49b Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sat, 14 Sep 2024 09:54:47 -0400 Subject: [PATCH 6/7] Revert to using the default branch of cisagov/ansible-role-amazon-ssm-agent We can do this now that cisagov/ansible-role-amazon-ssm-agent#57 has been merged. --- src/requirements.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/requirements.yml b/src/requirements.yml index 819129a..306f7e5 100644 --- a/src/requirements.yml +++ b/src/requirements.yml @@ -4,7 +4,6 @@ collections: roles: - name: amazon_ssm_agent src: https://github.com/cisagov/ansible-role-amazon-ssm-agent - version: bugfix/install-via-snap-on-ubuntu - name: automated_security_updates src: https://github.com/cisagov/ansible-role-automated-security-updates - name: banner From 885447b103fa0dc17e04f4a7b639c977ff13e37c Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sat, 14 Sep 2024 16:27:16 -0400 Subject: [PATCH 7/7] Finalize version from 1.0.1-rc.1 to 1.0.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index b473b97..5c4105c 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.0.1-rc.1" +__version__ = "1.0.1"