summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-07 13:49:46 -0400
committerGitHub <noreply@github.com>2016-07-07 13:49:46 -0400
commit8a0c9b6b6a9820b38694cb23979ffc7a8c358588 (patch)
tree687839cede227b76f92ae9cbf91a1d686f9164a1 /playbooks
parent1a2c22a060b8b6f0e64d452fdfc13012d3c067ed (diff)
parent4fb76b9d03e170afff1d35318946ef3fc5393f55 (diff)
downloadopenshift-8a0c9b6b6a9820b38694cb23979ffc7a8c358588.tar.gz
openshift-8a0c9b6b6a9820b38694cb23979ffc7a8c358588.tar.bz2
openshift-8a0c9b6b6a9820b38694cb23979ffc7a8c358588.tar.xz
openshift-8a0c9b6b6a9820b38694cb23979ffc7a8c358588.zip
Merge pull request #2126 from tbielawa/cleanup_dep_warnings
Clean up some deprecation warnings
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-node/config.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index b3491ef8d..80659dc52 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -121,7 +121,7 @@
| union(groups['oo_etcd_to_config'] | default([])))
| oo_collect('openshift.common.hostname') | default([]) | join (',')
}}"
- when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
+ when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
roles:
- openshift_node
@@ -137,7 +137,7 @@
| union(groups['oo_etcd_to_config'] | default([])))
| oo_collect('openshift.common.hostname') | default([]) | join (',')
}}"
- when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
+ when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
openshift_generate_no_proxy_hosts | default(True) | bool }}"
roles:
- openshift_node
@@ -184,7 +184,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 | default([])
+ with_items: "{{ etcd_needing_client_certs | default([]) }}"
- name: Retrieve the etcd cert tarballs
fetch:
src: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}.tgz"
@@ -192,7 +192,7 @@
flat: yes
fail_on_missing: yes
validate_checksum: yes
- with_items: etcd_needing_client_certs | default([])
+ with_items: "{{ etcd_needing_client_certs | default([]) }}"
- name: Copy the external etcd flannel certs to the nodes
hosts: oo_nodes_to_config