From 158bc58ed9df2926b04c63dc0c72a7aa4f2192a2 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Tue, 3 Oct 2017 13:25:01 -0400 Subject: Move etcd cert playbooks into etcd config path --- playbooks/common/openshift-cluster/config.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'playbooks/common/openshift-cluster') diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 4ca0d48e4..66ae941c3 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -18,10 +18,6 @@ - docker_image_availability - docker_storage -- include: ../openshift-etcd/ca.yml - -- include: ../openshift-etcd/certificates.yml - - include: ../openshift-etcd/config.yml - include: ../openshift-nfs/config.yml -- cgit v1.2.3 From a34bb1142f01ff0768e386a3a025a5a9012fd8eb Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Tue, 3 Oct 2017 11:38:19 -0400 Subject: Move master cert playbooks into master config path --- playbooks/common/openshift-cluster/config.yml | 4 ---- .../openshift-cluster/redeploy-certificates/openshift-ca.yml | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'playbooks/common/openshift-cluster') diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 66ae941c3..8d548b1dd 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -26,10 +26,6 @@ - include: ../openshift-loadbalancer/config.yml when: groups.oo_lb_to_config | default([]) | count > 0 -- include: ../openshift-master/ca.yml - -- include: ../openshift-master/certificates.yml - - include: ../openshift-master/config.yml - include: ../openshift-master/additional_config.yml diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml index 12cd209d2..e4193a00e 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml @@ -114,12 +114,18 @@ register: g_new_openshift_ca_mktemp changed_when: false -- include: ../../openshift-master/ca.yml +- name: Create OpenShift CA + hosts: oo_first_master vars: # Set openshift_ca_config_dir to a temporary directory where CA # will be created. We'll replace the existing CA with the CA # created in the temporary directory. openshift_ca_config_dir: "{{ hostvars[groups.oo_first_master.0].g_new_openshift_ca_mktemp.stdout }}" + roles: + - role: openshift_master_facts + - role: openshift_named_certificates + - role: openshift_ca + openshift_ca_host: "{{ groups.oo_first_master.0 }}" - name: Create temp directory for syncing certs hosts: localhost -- cgit v1.2.3 From 0e2b7006aeace1885e5ebdcafd9c0308c7c3ce18 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Tue, 3 Oct 2017 13:18:49 -0400 Subject: Move node cert playbook into node config path --- playbooks/common/openshift-cluster/config.yml | 2 -- 1 file changed, 2 deletions(-) (limited to 'playbooks/common/openshift-cluster') diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 8d548b1dd..96a43230d 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -30,8 +30,6 @@ - include: ../openshift-master/additional_config.yml -- include: ../openshift-node/certificates.yml - - include: ../openshift-node/config.yml - include: ../openshift-glusterfs/config.yml -- cgit v1.2.3