diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-18 13:44:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 13:44:33 -0500 |
| commit | 2b73c9713cd816a6095e40e10d664eff68c8e206 (patch) | |
| tree | 1bb7aa0fb99a3f8132e53a8898fbd57e171b71e1 /playbooks/common | |
| parent | f133c863a0ca657b7e0c87c117428e053ac74db0 (diff) | |
| parent | c25212b12ef7f7bd785f2a476f917eb439e3600a (diff) | |
| download | openshift-2b73c9713cd816a6095e40e10d664eff68c8e206.tar.gz openshift-2b73c9713cd816a6095e40e10d664eff68c8e206.tar.bz2 openshift-2b73c9713cd816a6095e40e10d664eff68c8e206.tar.xz openshift-2b73c9713cd816a6095e40e10d664eff68c8e206.zip | |
Merge pull request #3100 from abutcher/serials
Serialize cert creation in delegated commands
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates.yml b/playbooks/common/openshift-cluster/redeploy-certificates.yml index 6e3e04a6b..2383836d4 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml @@ -108,10 +108,6 @@ | oo_select_keys(groups['oo_etcd_to_config'] | default([])) | oo_collect('openshift.common.hostname') | default(none, true) }}" - openshift_master_hostnames: "{{ hostvars - | oo_select_keys(groups['oo_masters_to_config'] | default([])) - | oo_collect('openshift.common.all_hostnames') - | oo_flatten | unique }}" openshift_certificates_redeploy: true - role: openshift_etcd_client_certificates etcd_certificates_redeploy: true diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 39d64a126..de36fd263 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -134,10 +134,6 @@ | oo_select_keys(groups['oo_etcd_to_config'] | default([])) | oo_collect('openshift.common.hostname') | default(none, true) }}" - openshift_master_hostnames: "{{ hostvars - | oo_select_keys(groups['oo_masters_to_config'] | default([])) - | oo_collect('openshift.common.all_hostnames') - | oo_flatten | unique }}" openshift_master_hosts: "{{ groups.oo_masters_to_config }}" etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" etcd_cert_subdir: "openshift-master-{{ openshift.common.hostname }}" |