Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: christiangda/ansible-role-amazon-cloudwatch-agent
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.1.1
Choose a base ref
...
head repository: christiangda/ansible-role-amazon-cloudwatch-agent
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.1.2
Choose a head ref
  • 13 commits
  • 55 files changed
  • 3 contributors

Commits on Apr 18, 2022

  1. fix: yamllint stuff

    christiangda committed Apr 18, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    fe0c146 View commit details
  2. Copy the full SHA
    a27aefa View commit details
  3. fix: yamllint stuff

    christiangda committed Apr 18, 2022
    Copy the full SHA
    3e111f1 View commit details

Commits on Sep 29, 2022

  1. Fall back to main distribution vars file

    This fixes an issue on Ubuntu 22 when using this role that it couldn't find the proper variables file and failed on not having `cwa_gpg_dependencies_packages` variable set.
    lackac authored Sep 29, 2022
    Copy the full SHA
    29cde8c View commit details
  2. Merge pull request #44 from lackac/patch-1

    Fall back to main distribution vars file
    christiangda authored Sep 29, 2022
    Copy the full SHA
    f42f6da View commit details

Commits on Oct 7, 2022

  1. Add ubuntu 22 vars

    Nopraz committed Oct 7, 2022
    Copy the full SHA
    313d97d View commit details

Commits on Oct 11, 2022

  1. Merge pull request #45 from Nopraz/master

    Add ubuntu 22 vars
    christiangda authored Oct 11, 2022
    Copy the full SHA
    0051b7b View commit details

Commits on Oct 12, 2022

  1. Copy the full SHA
    ab491ad View commit details
  2. Copy the full SHA
    f7c85e8 View commit details
  3. Copy the full SHA
    b4c5873 View commit details
  4. Copy the full SHA
    5dd08cf View commit details
  5. Copy the full SHA
    538d68a View commit details
  6. Merge pull request #46 from christiangda/feat-improvements

    feat: support for new OS
    christiangda authored Oct 12, 2022
    Copy the full SHA
    263b198 View commit details
Showing with 372 additions and 219 deletions.
  1. +3 −3 .github/workflows/develop.yaml
  2. +1 −0 .yamllint
  3. +2 −0 README.md
  4. +1 −1 defaults/main.yml
  5. +1 −0 meta/main.yml
  6. +3 −3 molecule/centos-7/INSTALL.rst
  7. +1 −1 molecule/centos-7/molecule.yml
  8. +0 −14 molecule/centos-7/tests/test_default.py
  9. +3 −3 molecule/centos-8/INSTALL.rst
  10. +1 −1 molecule/centos-8/molecule.yml
  11. +0 −14 molecule/centos-8/tests/test_default.py
  12. +3 −3 molecule/default/INSTALL.rst
  13. +1 −1 molecule/default/molecule.yml
  14. +0 −14 molecule/default/tests/test_default.py
  15. +3 −3 molecule/docker/INSTALL.rst
  16. +0 −14 molecule/docker/tests/test_default.py
  17. +10 −0 molecule/docker/verify.yml
  18. +2 −2 molecule/podman/INSTALL.rst
  19. +16 −22 molecule/podman/molecule.yml
  20. +0 −14 molecule/podman/tests/test_default.py
  21. +2 −2 molecule/redhat-8/INSTALL.rst
  22. +0 −13 molecule/redhat-8/converge.yml
  23. +1 −1 molecule/redhat-8/molecule.yml
  24. +0 −14 molecule/redhat-8/prepare.yml
  25. +0 −14 molecule/redhat-8/tests/test_default.py
  26. +22 −0 molecule/rocky-8/INSTALL.rst
  27. +37 −0 molecule/rocky-8/converge.yml
  28. +26 −0 molecule/rocky-8/molecule.yml
  29. +3 −0 molecule/rocky-8/requirements.yml
  30. +10 −0 molecule/rocky-8/verify.yml
  31. +22 −0 molecule/rocky-9/INSTALL.rst
  32. +37 −0 molecule/rocky-9/converge.yml
  33. +21 −0 molecule/rocky-9/molecule.yml
  34. +3 −0 molecule/rocky-9/requirements.yml
  35. +10 −0 molecule/rocky-9/verify.yml
  36. +3 −3 molecule/ubuntu-21.04/INSTALL.rst
  37. +0 −10 molecule/ubuntu-21.04/converge.yml
  38. +1 −1 molecule/ubuntu-21.04/molecule.yml
  39. +0 −14 molecule/ubuntu-21.04/tests/test_default.py
  40. +22 −0 molecule/ubuntu-22.04/INSTALL.rst
  41. +39 −0 molecule/ubuntu-22.04/converge.yml
  42. +20 −0 molecule/ubuntu-22.04/molecule.yml
  43. +3 −0 molecule/ubuntu-22.04/requirements.yml
  44. +3 −3 molecule/vagrant/INSTALL.rst
  45. +8 −8 molecule/vagrant/molecule.yml
  46. +8 −5 tasks/install-redhat.yml
  47. +6 −5 tasks/main.yml
  48. +1 −1 vars/debian-8.yml
  49. +4 −4 vars/main.yml
  50. +3 −0 vars/rocky-9.yml
  51. +0 −2 vars/ubuntu-16.yml
  52. +0 −2 vars/ubuntu-18.yml
  53. +0 −2 vars/ubuntu-20.yml
  54. +0 −2 vars/ubuntu-21.yml
  55. +6 −0 vars/ubuntu-22.yml
6 changes: 3 additions & 3 deletions .github/workflows/develop.yaml
Original file line number Diff line number Diff line change
@@ -27,12 +27,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
#python: [2.7, 3.9]
# python: [2.7, 3.9]
python: [3.9]
#ansible: ["~=2.9", "~=3.4", "~=4.1"]
# ansible: ["~=2.9", "~=3.4", "~=4.1"]
ansible: [">=4.1"]
scenario: ["redhat-8", "ubuntu-21.04"]
#scenario: ["ubuntu-21.04"]
# scenario: ["ubuntu-21.04"]

steps:
- name: Check out the codebase.
1 change: 1 addition & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -14,3 +14,4 @@ ignore: |
.travis.yml
.ansible-lint
.yamllint
.github
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -44,6 +44,7 @@ This role work on RedHat, CentOS, Amazon Linux, Debian and Ubuntu distributions
* stream8
* Rocky Linux
* 8
* 9
* Amazon Linux
* 2
* Ubuntu
@@ -52,6 +53,7 @@ This role work on RedHat, CentOS, Amazon Linux, Debian and Ubuntu distributions
* 18.*
* 20.*
* 21.*
* 22.*
* Debian
* Stretch (9)
* buster (10)
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -114,4 +114,4 @@ cwa_logrotate_files: 5
# - true
# - false
# default value: false
cwa_debug: false
cwa_debug: false
1 change: 1 addition & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ galaxy_info:
- bionic
- focal
- impish
- jammy

galaxy_tags:
- aws
6 changes: 3 additions & 3 deletions molecule/centos-7/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*******
Docker driver installation guide
podman driver installation guide
*******

Requirements
============

* Docker Engine
* podman Engine

Install
=======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.

.. code-block:: bash
$ python3 -m pip install 'molecule[docker]'
$ python3 -m pip install 'molecule[podman]'
2 changes: 1 addition & 1 deletion molecule/centos-7/molecule.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ dependency:
name: galaxy

driver:
name: docker
name: podman

provisioner:
name: ansible
14 changes: 0 additions & 14 deletions molecule/centos-7/tests/test_default.py

This file was deleted.

6 changes: 3 additions & 3 deletions molecule/centos-8/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*******
Docker driver installation guide
podman driver installation guide
*******

Requirements
============

* Docker Engine
* podman Engine

Install
=======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.

.. code-block:: bash
$ python3 -m pip install 'molecule[docker]'
$ python3 -m pip install 'molecule[podman]'
2 changes: 1 addition & 1 deletion molecule/centos-8/molecule.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ dependency:
name: galaxy

driver:
name: docker
name: podman

provisioner:
name: ansible
14 changes: 0 additions & 14 deletions molecule/centos-8/tests/test_default.py

This file was deleted.

6 changes: 3 additions & 3 deletions molecule/default/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*******
Docker driver installation guide
podman driver installation guide
*******

Requirements
============

* Docker Engine
* podman Engine

Install
=======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.

.. code-block:: bash
$ python3 -m pip install 'molecule[docker]'
$ python3 -m pip install 'molecule[podman]'
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ dependency:
name: galaxy

driver:
name: docker
name: podman

provisioner:
name: ansible
14 changes: 0 additions & 14 deletions molecule/default/tests/test_default.py

This file was deleted.

6 changes: 3 additions & 3 deletions molecule/docker/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*******
Docker driver installation guide
podman driver installation guide
*******

Requirements
============

* Docker Engine
* podman Engine

Install
=======
@@ -19,4 +19,4 @@ widely recommended `'--user' flag`_ when invoking ``pip``.

.. code-block:: bash
$ python3 -m pip install 'molecule[docker]'
$ python3 -m pip install 'molecule[podman]'
14 changes: 0 additions & 14 deletions molecule/docker/tests/test_default.py

This file was deleted.

10 changes: 10 additions & 0 deletions molecule/docker/verify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
# This is an example playbook to execute Ansible tests.

- name: Verify
hosts: all
gather_facts: false
tasks:
- name: Example assertion
ansible.builtin.assert:
that: true
4 changes: 2 additions & 2 deletions molecule/podman/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*******
Docker driver installation guide
podman driver installation guide
*******

Requirements
============

* Docker Engine
* podman Engine

Install
=======
38 changes: 16 additions & 22 deletions molecule/podman/molecule.yml
Original file line number Diff line number Diff line change
@@ -18,25 +18,19 @@ scenario:
platforms:
- name: redhat-8
image: registry.access.redhat.com/ubi8/ubi

# - name: redhat-7
# image: registry.access.redhat.com/ubi7/ubi

# - name: centos-stream8
# image: quay.io/centos/centos:stream8

# - name: centos-7
# image: quay.io/centos/centos:7

# - name: amazonlinux-2
# image: public.ecr.aws/amazonlinux/amazonlinux:2

# - name: ubuntu-18.04
# image: public.ecr.aws/ubuntu/ubuntu:18.04

# - name: ubuntu-20.04
# image: public.ecr.aws/ubuntu/ubuntu:20.04
# - name: debian-buster
# image: debian:buster
# - name: debian-stretch
# image: debian:stretch
# - name: redhat-7
# image: registry.access.redhat.com/ubi7/ubi
# - name: centos-stream8
# image: quay.io/centos/centos:stream8
# - name: centos-7
# image: quay.io/centos/centos:7
# - name: amazonlinux-2
# image: public.ecr.aws/amazonlinux/amazonlinux:2
# - name: ubuntu-18.04
# image: public.ecr.aws/ubuntu/ubuntu:18.04
# - name: ubuntu-20.04
# image: public.ecr.aws/ubuntu/ubuntu:20.04
# - name: debian-buster
# image: debian:buster
# - name: debian-stretch
# image: debian:stretch
14 changes: 0 additions & 14 deletions molecule/podman/tests/test_default.py

This file was deleted.

4 changes: 2 additions & 2 deletions molecule/redhat-8/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*******
Docker driver installation guide
podman driver installation guide
*******

Requirements
============

* Docker Engine
* podman Engine

Install
=======
13 changes: 0 additions & 13 deletions molecule/redhat-8/converge.yml
Original file line number Diff line number Diff line change
@@ -2,19 +2,6 @@
- name: Converge
hosts: all

pre_tasks:
- name: Update apt cache
apt: update_cache=true cache_valid_time=600
when: ansible_os_family == 'Debian'
changed_when: false

- name: Install gnupg
apt:
name: gnupg
state: latest
when: ansible_os_family == 'Debian'
changed_when: false

tasks:
- name: "Include christiangda.epel_repo"
include_role:
2 changes: 1 addition & 1 deletion molecule/redhat-8/molecule.yml
Original file line number Diff line number Diff line change
@@ -17,4 +17,4 @@ scenario:

platforms:
- name: redhat-8
image: registry.access.redhat.com/ubi8/ubi
image: registry.access.redhat.com/ubi8/ubi
14 changes: 0 additions & 14 deletions molecule/redhat-8/prepare.yml

This file was deleted.

14 changes: 0 additions & 14 deletions molecule/redhat-8/tests/test_default.py

This file was deleted.

22 changes: 22 additions & 0 deletions molecule/rocky-8/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
*******
podman driver installation guide
*******

Requirements
============

* podman Engine

Install
=======

Please refer to the `Virtual environment`_ documentation for installation best
practices. If not using a virtual environment, please consider passing the
widely recommended `'--user' flag`_ when invoking ``pip``.

.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site

.. code-block:: bash
$ python3 -m pip install 'molecule[podman]'
Loading