ansible-lint changes

devopswise · May 6, 2019 · c93c3b3 · c93c3b3
1 parent 5017b59
commit c93c3b3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
@@ -33,9 +33,10 @@
   become_method: sudo
 
 - name: Stop and disable firewalld
-  shell: "systemctl disable firewalld && systemctl stop firewalld"
-  become: yes
-  become_method: sudo
+  service:
+    name: firewalld
+    state: stopped
+    enabled: no
 
 - name: Create base directories
   file: path="{{ item }}" state=directory mode=0777 owner="0" group="0"
@@ -56,7 +57,7 @@
 
 # enable extra
 - name: enable extras for epel
-  shell: "{{ item }}"
+  command: "{{ item }}"
   with_items:
     - "yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo"
     - "yum -y --enablerepo=extras install epel-release"

diff --git a/roles/openldap/tasks/main.yml b/roles/openldap/tasks/main.yml
@@ -23,15 +23,15 @@
 
 - name: sync structure.ldif
   template:
-    src: ../templates/structure.ldif.j2
+    src: structure.ldif.j2
     dest: "{{ docker_volumes }}/{{ openldap_service_name }}/structure.ldif"
     mode: 0755
   become: yes
   become_method: sudo
 
 - name: sync docker-compose.yml
-  template: 
-    src: ../templates/docker-compose.yml.j2
+  template:
+    src: docker-compose.yml.j2
     dest: /tmp/{{ openldap_service_name }}/docker-compose.yml
     mode: 0755
   become: yes

diff --git a/roles/smtp_relay/tasks/main.yml b/roles/smtp_relay/tasks/main.yml
@@ -1,7 +1,12 @@
 ---
 - name: Create a directory to store volume
   when: false
-  file: path="{{ item }}" state=directory mode=755 owner="{{ smtp_relay_user }}" group="{{ smtp_relay_group }}"
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: "0755"
+    owner: "{{ smtp_relay_user }}"
+    group: "{{ smtp_relay_group }}"
   with_items:
     - "{{ docker_logs }}/{{ smtp_relay_service_name }}"
     - "{{ docker_volumes }}/{{ smtp_relay_service_name }}"
@@ -14,8 +19,8 @@
   become_method: sudo
 
 - name: sync docker-compose.yml
-  template: 
-    src: ../templates/docker-compose.yml.j2
+  template:
+    src: docker-compose.yml.j2
     dest: /tmp/{{ smtp_relay_service_name }}/docker-compose.yml
     mode: 0755
   become: yes

diff --git a/roles/squid/tasks/main.yml b/roles/squid/tasks/main.yml
@@ -13,16 +13,16 @@
   become_method: sudo
 
 - name: sync docker-compose.yml
-  template: 
-    src: ../templates/docker-compose.yml.j2
+  template:
+    src: docker-compose.yml.j2
     dest: /tmp/{{ squid_service_name }}/docker-compose.yml
     mode: 0755
   become: yes
   become_method: sudo
 
 - name: sync squid3.conf
-  template: 
-    src: ../templates/squid3.conf.j2
+  template:
+    src: squid3.conf.j2
     dest: "{{ docker_volumes }}/{{ squid_service_name }}/squid3.conf"
     mode: 0755
   become: yes

diff --git a/roles/traefik/tasks/main.yml b/roles/traefik/tasks/main.yml
@@ -30,7 +30,7 @@
     traefik_admin_pass_hash: "{{ lookup('password', '../credentials/traefik_admin_pass_hash_md5 chars=ascii_letters,digits,hexdigits length=12') }}"
 
 - name: generate self-signed ssl certificate if not exists
-  stat: 
+  stat:
     path: ../credentials/traefik_http_ssl.crt
   register: traefik_http_ssl_crt
   delegate_to: localhost
@@ -42,7 +42,9 @@
   register: traefik_http_ssl_key
 
 - name: create openssl configuration file
-  template: src=../templates/openssl_req.cfg.j2 dest=../credentials/openssl_req.cfg
+  template: 
+    src: openssl_req.cfg.j2
+    dest: ../credentials/openssl_req.cfg
   delegate_to: localhost
 
 - name: generate self-signed ssl certificate if not exists