Improve ansible roles

Author: mqasimsarfraz

roles/docker-registry-proxy/defaults/main.yml

@@ -9,6 +9,10 @@ docker_proxy_ecr_access_id:
 docker_proxy_ecr_secret_key:
 docker_proxy_ecr_region:
 
-docker_proxy_ssl_enabled:
+# ssl config
+docker_proxy_ssl_enabled: false
+docker_proxy_ssl_copy_certs: false
 docker_proxy_ssl_host_path: /registry
+docker_proxy_ssl_host_cert_name: certificate.pem
+docker_proxy_ssl_host_key_name: key.pem
 docker_proxy_ssl_container_path: /opt/nginx

roles/docker-registry-proxy/tasks/main.yaml

@@ -10,7 +10,9 @@
   with_items:
     - certificate.pem
     - key.pem
-  when: docker_proxy_ssl_enabled | bool
+  when:
+    - docker_proxy_ssl_enabled | bool
+    - docker_proxy_ssl_copy_certs | bool
 
 - name: Print current cache directory size information
   become: true
@@ -44,8 +46,8 @@
       -v {{ docker_proxy_cache_path }}:/cache
 
       {% if docker_proxy_ssl_enabled | bool %}
-      -v {{ docker_proxy_ssl_host_path }}/certificate.pem:{{ docker_proxy_ssl_container_path }}/certificate.pem
-      -v {{ docker_proxy_ssl_host_path }}/key.pem:{{ docker_proxy_ssl_container_path }}/key.pem
+      -v {{ docker_proxy_ssl_host_path }}/{{ docker_proxy_ssl_host_cert_name }}:{{ docker_proxy_ssl_container_path }}/certificate.pem
+      -v {{ docker_proxy_ssl_host_path }}/{{ docker_proxy_ssl_host_key_name }}:{{ docker_proxy_ssl_container_path }}/key.pem
 
       -e ENABLE_SSL=true
       -e REGISTRY_HTTP_TLS_KEY={{ docker_proxy_ssl_container_path }}/key.pem

syntax-check.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+echo "Performing syntax check on ansible playbooks"
+
+ansible-playbook -i hosts --syntax-check playbook-docker-registry-proxy.yaml