Fix deprecation warning for undefined variables

'with_' clauses are evaluated before 'when' clauses. In Ansible 1.9
the task is silently skipped when a variable within a 'with_' clause is
undefined, Ansible 2 provides a deprecation warning.

Separate the task deploying a user provided ssl cert and key into
two and check them individually for 'haproxy_user_ssl_cert' or
'haproxy_user_ssl_key' being defined.

Change-Id: I75367fe25d15d35ff60203b7c1d78437d613404d
This commit is contained in:
Jimmy McCrory 2016-07-19 16:39:04 -07:00 committed by Jesse Pretorius (odyssey4me)
parent ab62d7d565
commit d572f3395b

View File

@ -13,19 +13,27 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
- name: Drop user provided ssl cert and key - name: Deploy user provided ssl cert
copy: copy:
src: "{{ item.src }}" src: "{{ haproxy_user_ssl_cert }}"
dest: "{{ item.dest }}" dest: "{{ haproxy_ssl_cert }}"
owner: "root" owner: "root"
group: "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: notify:
- regen pem - regen pem
tags: tags: