summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-14 16:04:01 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-14 16:04:01 -0300
commit03f31fdc581eea090388b5a60b3818167eb47c0c (patch)
tree75a29846b763d24bf52c98f786ce1b6189c3a626 /playbooks/common/openshift-master
parent3073846a8c9e02af06d4d56f0141766b2337424b (diff)
parentfaf5618ec483baa7618f02de91128e8f1eaaa471 (diff)
downloadopenshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.gz
openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.bz2
openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.xz
openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.zip
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index dbf071b67..bb8fb77b6 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -186,11 +186,6 @@
| list ) }}"
master_cert_subdir: master-{{ openshift.common.hostname }}
master_cert_config_dir: "{{ openshift.common.config_base }}/master"
- - set_fact:
- openshift_infra_nodes: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'])
- | oo_nodes_with_label('region', 'infra')
- | oo_collect('inventory_hostname') }}"
- when: openshift_infra_nodes is not defined and groups.oo_nodes_to_config | default([]) | length > 0
- name: Configure master certificates
hosts: oo_first_master