summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_certificates
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-03 12:12:46 -0500
committerGitHub <noreply@github.com>2017-05-03 12:12:46 -0500
commit13f91534f8e8539bfe31e50a38f5b69cbc124ed9 (patch)
tree75fa8a949be38bda3cbd79e7c8f445e5d01087f2 /roles/openshift_master_certificates
parent1163633a1de10133f0fca505e88f4d4610314882 (diff)
parent828ccd86df772bc5dbf5617dd257740338e81e30 (diff)
downloadopenshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.tar.gz
openshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.tar.bz2
openshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.tar.xz
openshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.zip
Merge pull request #4062 from abutcher/atomicf25
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master_certificates')
-rw-r--r--roles/openshift_master_certificates/tasks/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml
index d4c9a96ca..33a0af07f 100644
--- a/roles/openshift_master_certificates/tasks/main.yml
+++ b/roles/openshift_master_certificates/tasks/main.yml
@@ -64,10 +64,10 @@
--signer-key={{ openshift_ca_key }}
--signer-serial={{ openshift_ca_serial }}
--overwrite=false
+ when: inventory_hostname != openshift_ca_host
with_items: "{{ hostvars
| oo_select_keys(groups['oo_masters_to_config'])
- | oo_collect(attribute='inventory_hostname', filters={'master_certs_missing':True})
- | difference([openshift_ca_host])}}"
+ | oo_collect(attribute='inventory_hostname', filters={'master_certs_missing':True}) }}"
delegate_to: "{{ openshift_ca_host }}"
run_once: true
@@ -94,8 +94,8 @@
creates: "{{ openshift_generated_configs_dir }}/master-{{ hostvars[item].openshift.common.hostname }}/openshift-master.kubeconfig"
with_items: "{{ hostvars
| oo_select_keys(groups['oo_masters_to_config'])
- | oo_collect(attribute='inventory_hostname', filters={'master_certs_missing':True})
- | difference([openshift_ca_host])}}"
+ | oo_collect(attribute='inventory_hostname', filters={'master_certs_missing':True}) }}"
+ when: inventory_hostname != openshift_ca_host
delegate_to: "{{ openshift_ca_host }}"
run_once: true