Merge pull request #1839 from abutcher/v2-deprecations

Cleanup various deprecation warnings.

3 files changed, 12 insertions, 12 deletions

diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml
index 01c092625..6cb3a954f 100644
--- a/playbooks/common/openshift-etcd/config.yml
+++ b/playbooks/common/openshift-etcd/config.yml
@@ -53,7 +53,7 @@
         -C {{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }} .
     args:
       creates: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}.tgz"
-    with_items: etcd_needing_server_certs
+    with_items: "{{ etcd_needing_server_certs | default([]) }}"
   - name: Retrieve the etcd cert tarballs
     fetch:
       src: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}.tgz"
@@ -61,7 +61,7 @@
       flat: yes
       fail_on_missing: yes
       validate_checksum: yes
-    with_items: etcd_needing_server_certs
+    with_items: "{{ etcd_needing_server_certs | default([]) }}"
 
 # Configure a first etcd host to avoid conflicts in choosing a leader
 # if other members come online too quickly.
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index b9786295c..1f5e3aaff 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -120,7 +120,7 @@
         -C {{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }} .
     args:
       creates: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}.tgz"
-    with_items: etcd_needing_client_certs
+    with_items: "{{ etcd_needing_client_certs | default([]) }}"
   - name: Retrieve the etcd cert tarballs
     fetch:
       src: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}.tgz"
@@ -128,7 +128,7 @@
       flat: yes
       fail_on_missing: yes
       validate_checksum: yes
-    with_items: etcd_needing_client_certs
+    with_items: "{{ etcd_needing_client_certs | default([]) }}"
 
 - name: Copy the external etcd certs to the masters
   hosts: oo_masters_to_config
@@ -178,7 +178,7 @@
   - name: Check status of master certificates
     stat:
       path: "{{ openshift.common.config_base }}/master/{{ item }}"
-    with_items: openshift_master_certs
+    with_items: "{{ openshift_master_certs }}"
     register: g_master_cert_stat_result
   - set_fact:
       master_certs_missing: "{{ False in (g_master_cert_stat_result.results
@@ -213,7 +213,7 @@
       state: absent
     when: groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config
     with_nested:
-    - masters_needing_certs
+    - "{{ masters_needing_certs | default([]) }}"
     - - master.etcd-client.crt
       - master.etcd-client.key
 
@@ -223,7 +223,7 @@
         -C {{ master_generated_certs_dir }}/{{ item.master_cert_subdir }} .
     args:
       creates: "{{ master_generated_certs_dir }}/{{ item.master_cert_subdir }}.tgz"
-    with_items: masters_needing_certs
+    with_items: "{{ masters_needing_certs | default([]) }}"
 
   - name: Retrieve the master cert tarball from the master
     fetch:
@@ -232,7 +232,7 @@
       flat: yes
       fail_on_missing: yes
       validate_checksum: yes
-    with_items: masters_needing_certs
+    with_items: "{{ masters_needing_certs | default([]) }}"
 
 - name: Configure load balancers
   hosts: oo_lb_to_config
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index ba050bfe7..f0bb91568 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -66,7 +66,7 @@
         -C {{ item.config_dir }} .
     args:
       creates: "{{ item.config_dir }}.tgz"
-    with_items: nodes_needing_certs
+    with_items: "{{ nodes_needing_certs | default([]) }}"
 
   - name: Retrieve the node config tarballs from the master
     fetch:
@@ -75,7 +75,7 @@
       flat: yes
       fail_on_missing: yes
       validate_checksum: yes
-    with_items: nodes_needing_certs
+    with_items: "{{ nodes_needing_certs | default([]) }}"
 
 - name: Deploy node certificates
   hosts: oo_nodes_to_config
@@ -179,7 +179,7 @@
         -C {{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }} .
     args:
       creates: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}.tgz"
-    with_items: etcd_needing_client_certs
+    with_items: "{{ etcd_needing_client_certs | default([]) }}"
     when: etcd_client_flannel_certs_missing is defined and etcd_client_flannel_certs_missing
   - name: Retrieve the etcd cert tarballs
     fetch:
@@ -188,7 +188,7 @@
       flat: yes
       fail_on_missing: yes
       validate_checksum: yes
-    with_items: etcd_needing_client_certs
+    with_items: "{{ etcd_needing_client_certs | default([]) }}"
     when: etcd_client_flannel_certs_missing is defined and etcd_client_flannel_certs_missing
 
 - name: Copy the external etcd flannel certs to the nodes