diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-02-05 12:47:29 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-02-16 14:21:04 -0500 |
| commit | 02cf4ef8e279602190ae991f028dc36793747e9e (patch) | |
| tree | 62403c6c357dfc8500d89c7d6fb32e70d4470a53 /playbooks/common/openshift-master | |
| parent | 6d3e1764658582150f6c776c2662075531ccf70f (diff) | |
| download | openshift-02cf4ef8e279602190ae991f028dc36793747e9e.tar.gz openshift-02cf4ef8e279602190ae991f028dc36793747e9e.tar.bz2 openshift-02cf4ef8e279602190ae991f028dc36793747e9e.tar.xz openshift-02cf4ef8e279602190ae991f028dc36793747e9e.zip | |
Generate each master's certificates separately.
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 44bb4313a..2931af253 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -1,6 +1,6 @@ --- - name: Set master facts and determine if external etcd certs need to be generated - hosts: oo_first_master:oo_masters_to_config + hosts: oo_masters_to_config pre_tasks: - name: Check for RPM generated config marker file .config_managed stat: @@ -186,10 +186,6 @@ masters_needing_certs: "{{ hostvars | oo_select_keys(groups['oo_masters_to_config'] | difference(groups['oo_first_master'])) | oo_filter_list(filter_attr='master_certs_missing') }}" - master_hostnames: "{{ hostvars - | oo_select_keys(groups['oo_masters_to_config']) - | oo_collect('openshift.common.all_hostnames') - | oo_flatten | unique }}" sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" roles: - openshift_master_certificates @@ -343,12 +339,12 @@ file: path: "{{ openshift.common.config_base }}/master" state: directory - when: master_certs_missing and 'oo_first_master' not in group_names + when: master_certs_missing | bool and 'oo_first_master' not in group_names - name: Unarchive the tarball on the master unarchive: src: "{{ sync_tmpdir }}/{{ master_cert_subdir }}.tgz" dest: "{{ master_cert_config_dir }}" - when: master_certs_missing and 'oo_first_master' not in group_names + when: master_certs_missing | bool and 'oo_first_master' not in group_names roles: - openshift_master - role: nickhammond.logrotate |