Fix idempotency of contaienr eestarting

roles/demo-etherpad/handlers/main.yml

@@ -1,5 +1,11 @@
 ---
-- name: restart apache
-  systemd:
-    name: apache2
-    state: restarted
+# - name: restart apache
+#   systemd:
+#     name: apache2
+#     state: restarted
+
+- name: Restart the Etherpad container
+  docker_container:
+    name: "{{ containers.etherpad }}"
+    restart: true
+    state: started

roles/demo-etherpad/tasks/main.yml

@@ -5,20 +5,21 @@
     state: "directory"
     mode: "0755"
     owner: "root"
+  notify: "Restart the Etherpad container"
 
 - name: Copy settings.json
   copy:
     src: "{{ item }}"
     dest: "{{ etherpad_basedir }}"
   with_items:
     - settings.json
+  notify: "Restart the Etherpad container"
 
 - name: Create the Etherpad container
   docker_container:
     name: "{{ containers.etherpad }}"
     image: "{{ images.etherpad }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     env:

roles/demo-weblogin/tasks/main.yml

@@ -12,7 +12,6 @@
     name: "{{ containers.weblogin }}"
     image: "{{ images.weblogin }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     env:

roles/docker_db/handlers/main.yml

@@ -1,7 +1,13 @@
 ---
-- name: restart MariaDB
-  systemd:
-    daemon_reload: true
-    name: "mariadb"
-    state: "restarted"
-    enabled: true
+# - name: restart MariaDB
+#   systemd:
+#     daemon_reload: true
+#     name: "mariadb"
+#     state: "restarted"
+#     enabled: true
+
+- name: Restart the database container
+  docker_container:
+    name: "{{ containers.db }}"
+    restart: true
+    state: started

roles/docker_db/tasks/main.yml

@@ -142,6 +142,7 @@
   with_items:
     - { path: "{{mariadb_conf_dir}}",  mode: "0755" }
     - { path: "{{mariadb_cert_dir}}",  mode: "0755" }
+  notify: "Restart the database container"
 
 - name: Create wildcard backend key
   copy:
@@ -151,6 +152,8 @@
     group: "ssl-cert"
     mode: 0644
   no_log: "{{sram_ansible_nolog}}"
+  notify: "Restart the database container"
+
 
 - name: Create wildcard backend cert
   copy:
@@ -159,12 +162,14 @@
     owner: "root"
     group: "root"
     mode: 0644
+  notify: "Restart the database container"
 
 - name: Install mariadb config
   template:
     src: 60-sram.cnf.j2
     # dest: /etc/mysql/mariadb.conf.d/60-scz.cnf
     dest: "{{mariadb_conf_dir}}/sram.cnf"
+  notify: "Restart the database container"
   # notify: restart MariaDB
 
 # - name: add mysql user to ssl-cert group
@@ -188,7 +193,6 @@
     name: "{{ containers.db }}"
     image: "{{ images.db }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     ports:

roles/docker_ldap/handlers/main.yml

@@ -17,3 +17,8 @@
     enabled: true
     daemon-reload: true
 
+- name: Restart the ldap container
+  docker_container:
+    name: "{{ containers.ldap }}"
+    restart: true
+    state: started

roles/docker_ldap/tasks/main.yml

@@ -49,6 +49,7 @@
     - { path: "{{ldap_ldif_dir}}",  mode: "0755" }
     - { path: "{{ldap_certs_dir}}", mode: "0755" }
     - { path: "{{ldap_data_dir}}",  mode: "0777" }
+  notify: Restart the ldap container
 
 - name: Copy schemas
   copy:
@@ -63,6 +64,7 @@
     - eduMember.ldif
     - voPerson.ldif
     - sramPerson.ldif
+  notify: Restart the ldap container
 
 # - name: Copy DH params
 #   copy:
@@ -80,6 +82,7 @@
     # group: "ssl-cert"
     mode: "0644"
   no_log: "{{sram_ansible_nolog}}"
+  notify: Restart the ldap container
 
 - name: Create wildcard backend cert
   copy:
@@ -88,20 +91,21 @@
     # owner: "root"
     # group: "root"
     mode: "0644"
+  notify: Restart the ldap container
 
 - name: Copy wildcard frontend cert
   copy:
     src: /etc/ssl/certs/sram-https.pem
     remote_src: true
     dest: "{{ldap_certs_dir}}/frontend.crt"
     mode: "0644"
+  notify: Restart the ldap container
 
 - name: Create the ldap container
   docker_container:
     name: "{{ containers.ldap }}"
     image: "{{ images.ldap }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     ports:

roles/docker_metadata/handlers/main.yml

@@ -1,14 +1,14 @@
 ---
-- name: restart nginx
-  service:
-    name: nginx
-    state: restarted
+# - name: restart nginx
+#   service:
+#     name: nginx
+#     state: restarted
 
-- name: "systemd daemon-reload"
-  systemd:
-    daemon_reload: true
+# - name: "systemd daemon-reload"
+#   systemd:
+#     daemon_reload: true
 
-- name: "restart zabbix-agent"
-  systemd:
-    name: "zabbix-agent2.service"
-    state: "restarted"
+# - name: "restart zabbix-agent"
+#   systemd:
+#     name: "zabbix-agent2.service"
+#     state: "restarted"

roles/docker_metadata/tasks/main.yml

@@ -140,7 +140,6 @@
     name: "{{ containers.metadata }}"
     image: "{{ images.metadata }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     volumes:

roles/docker_plsc/handlers/main.yml

@@ -1,12 +1,18 @@
 ---
-- name: enable plsc job
-  systemd:
-    name: "plsc.timer"
-    enabled: true
-    state: "restarted"
-    daemon_reload: true
+# - name: enable plsc job
+#   systemd:
+#     name: "plsc.timer"
+#     enabled: true
+#     state: "restarted"
+#     daemon_reload: true
 
-- name: "restart zabbix-agent"
-  systemd:
-    name: "zabbix-agent2.service"
-    state: "restarted"
+# - name: "restart zabbix-agent"
+#   systemd:
+#     name: "zabbix-agent2.service"
+#     state: "restarted"
+
+- name: Restart the plsc container
+  docker_container:
+    name: "{{ containers.plsc }}"
+    restart: true
+    state: started

roles/docker_plsc/tasks/main.yml

@@ -38,6 +38,7 @@
     dest: "{{ plsc_dir }}/plsc.yml"
     mode: "0640"
   no_log: "{{sram_ansible_nolog}}"
+  notify: "Restart the plsc container"
 
 # - name: "Copy plsc_monitor script"
 #   copy:
@@ -63,7 +64,6 @@
     name: "{{ containers.plsc }}"
     image: "{{ images.plsc }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     # volumes:

roles/docker_pyff/tasks/main.yml

@@ -143,7 +143,6 @@
     name: "{{ containers.pyff }}"
     image: "{{ images.pyff }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     volumes:
@@ -154,4 +153,3 @@
       - "{{ metadata_dirs.web }}:/opt/pyff/web"
     networks:
       - name: "bridge"
-

roles/docker_sbs/tasks/main.yml

@@ -264,7 +264,6 @@
     name: "{{ containers.redis }}"
     image: "{{ images.redis }}"
     restart_policy: "always"
-    restart: true
     state: started
     # pull: true
     command: redis-server /usr/local/etc/redis/redis.conf
@@ -318,7 +317,7 @@
     # pull: true
     volumes:
       - "{{ sbs_apache_conf }}:/etc/apache2/sites-enabled/sbs.conf:ro"
-      - sbs_static:/var/www/html
+      - "sbs_static:/var/www/html"
     networks:
       - name: "{{traefik_network}}"
       - name: "{{internal_network}}"