Merge pull request #10 from christiangda/develop

implemented issue #8, support for playbooks with --check option
christiangda · Dec 30, 2019 · 1860840 · 1860840
2 parents fe565b6 + 4a5e9cb
commit 1860840
Show file tree

Hide file tree

Showing 36 changed files with 11 additions and 1 deletion.
diff --git a/.ansible-lint b/.ansible-lint
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/.yamllint b/.yamllint
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.1
+2.0.2
diff --git a/VERSION.md b/VERSION.md
@@ -1,5 +1,9 @@
 # VERSION Details
 
+## 2.0.2
+
+* Improved to support ansible playbooks with option `--check` reporte in issue #8 [playbook fails on --check](https://github.com/christiangda/ansible-role-amazon-cloudwatch-agent/issues/8)
+
 ## 2.0.1
 
 * Remove the need to install collectd package when you are not [Retrieve Custom Metrics with collectd](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Agent-custom-metrics-collectd.html), reported in issue #7 --> [collectd is not a required dependency](https://github.com/christiangda/ansible-role-amazon-cloudwatch-agent/issues/7)

diff --git a/defaults/main.yml b/defaults/main.yml
diff --git a/handlers/main.yml b/handlers/main.yml
diff --git a/meta/main.yml b/meta/main.yml
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
diff --git a/molecule/default/INSTALL.rst b/molecule/default/INSTALL.rst
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
diff --git a/molecule/vagrant/INSTALL.rst b/molecule/vagrant/INSTALL.rst
diff --git a/molecule/vagrant/molecule.yml b/molecule/vagrant/molecule.yml
diff --git a/molecule/vagrant/playbook.yml b/molecule/vagrant/playbook.yml
diff --git a/molecule/vagrant/prepare.yml b/molecule/vagrant/prepare.yml
diff --git a/molecule/vagrant/tests/test_log_rotate.py b/molecule/vagrant/tests/test_log_rotate.py
diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -32,6 +32,8 @@
           - "Line [{{ cwa_profile }}] is not present in file {{ cwa_agent_profile_credentials_file }}"
       failed_when: presence.changed
       when: profile_credentials_file.stat.exists is defined and profile_credentials_file.stat.exists and presence.changed
+
+  ignore_errors: "{{ ansible_check_mode }}"
   when: cwa_use_credentials
 
 - name: Deploy {{ cwa_package }} common configuration file

diff --git a/tasks/install-debian.yml b/tasks/install-debian.yml
@@ -64,5 +64,6 @@
   apt:
     deb: "{{ cwa_temp_path }}/{{ cwa_package }}.deb"
     state: present
+  ignore_errors: "{{ ansible_check_mode }}"
   tags:
     - install
diff --git a/tasks/install-redhat.yml b/tasks/install-redhat.yml
@@ -89,6 +89,7 @@
   when: >
     ansible_os_family == 'RedHat' and
     ansible_distribution == 'Amazon'
+  ignore_errors: "{{ ansible_check_mode }}"
   tags:
     - install
 
@@ -109,6 +110,7 @@
       ansible_distribution_major_version == '7' or
       ansible_distribution_major_version == '6'
     )
+  ignore_errors: "{{ ansible_check_mode }}"
   tags:
     - install
 
@@ -127,5 +129,6 @@
       ansible_distribution == 'RedHat'
     ) and
     ansible_distribution_major_version == '8'
+  ignore_errors: "{{ ansible_check_mode }}"
   tags:
     - install
diff --git a/tasks/main.yml b/tasks/main.yml
diff --git a/templates/agent/amazon-cloudwatch-agent.json.j2 b/templates/agent/amazon-cloudwatch-agent.json.j2
diff --git a/templates/agent/common-config.toml.j2 b/templates/agent/common-config.toml.j2
diff --git a/templates/logrotate/aws-cwa.j2 b/templates/logrotate/aws-cwa.j2
diff --git a/vars/amazon.yml b/vars/amazon.yml
diff --git a/vars/centos.yml b/vars/centos.yml
diff --git a/vars/debian.yml b/vars/debian.yml
diff --git a/vars/main.yml b/vars/main.yml
diff --git a/vars/redhat.yml b/vars/redhat.yml
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml