Merge "Fix deprecation warning for undefined variables"

playbooks/roles/haproxy_server/tasks/haproxy_ssl_configuration.yml

@@ -13,19 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Drop user provided ssl cert and key
+- name: Deploy user provided ssl cert
   copy:
-    src: "{{ item.src }}"
+    src: "{{ haproxy_user_ssl_cert }}"
-    dest: "{{ item.dest }}"
+    dest: "{{ haproxy_ssl_cert }}"
     owner: "root"
     group: "root"
-    mode: "{{ item.mode }}"
+    mode: "0644"
-  with_items:
+  when: haproxy_user_ssl_cert is defined
-    - { src: "{{ haproxy_user_ssl_cert }}", dest: "{{ haproxy_ssl_cert }}", mode: "0644" }
+  notify:
-    - { src: "{{ haproxy_user_ssl_key }}", dest: "{{ haproxy_ssl_key }}", mode: "0640" }
+    - regen pem
-  when:
+  tags:
-    - haproxy_user_ssl_cert is defined
+    - haproxy-ssl
-    - haproxy_user_ssl_key is defined
+
+- name: Deploy user provided ssl key
+  copy:
+    src: "{{ haproxy_user_ssl_key }}"
+    dest: "{{ haproxy_ssl_key }}"
+    owner: "root"
+    group: "root"
+    mode: "0600"
+  when: haproxy_user_ssl_key is defined
   notify:
     - regen pem
   tags: