summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-01-16 11:41:56 -0500
committerAndrew Butcher <abutcher@redhat.com>2017-01-16 16:16:01 -0500
commitb30c15b83937e45b7b3356ef4cb6e93c9203ff68 (patch)
treec1bd2399f23de71ae18498cb966804b24f95c68c /playbooks/common
parentb01d19b5a37330c4b3fea5f1f54efd6ef0e207c0 (diff)
downloadopenshift-b30c15b83937e45b7b3356ef4cb6e93c9203ff68.tar.gz
openshift-b30c15b83937e45b7b3356ef4cb6e93c9203ff68.tar.bz2
openshift-b30c15b83937e45b7b3356ef4cb6e93c9203ff68.tar.xz
openshift-b30c15b83937e45b7b3356ef4cb6e93c9203ff68.zip
Create individual serving cert and loopback kubeconfig for additional masters.
Deprecates use of 'create-master-certs' for generating master serving certificate and loopback kubeconfig in order to reference the first master's CA serial file.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/redeploy-certificates.yml4
-rw-r--r--playbooks/common/openshift-master/config.yml4
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 }}"