diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-04 16:30:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 16:30:31 -0700 |
| commit | 30daf85143720c1350a197a8b40f9f1dbff34f29 (patch) | |
| tree | 74cd101e291de9d950a738f836f0640639d57291 /playbooks/common/openshift-cluster | |
| parent | cb7505c0f76f8388b49b36550376fbae1654c04f (diff) | |
| parent | 2c483c16492dda53c2ffff5b6b84172046d58c67 (diff) | |
| download | openshift-30daf85143720c1350a197a8b40f9f1dbff34f29.tar.gz openshift-30daf85143720c1350a197a8b40f9f1dbff34f29.tar.bz2 openshift-30daf85143720c1350a197a8b40f9f1dbff34f29.tar.xz openshift-30daf85143720c1350a197a8b40f9f1dbff34f29.zip | |
Merge pull request #5643 from mtnbikenc/refactor-certificates
Automatic merge from submit-queue.
Refactor certificate playbooks for checkpointing
The recent breakout of the certificate playbooks resulted in the certificate portion of the install to be outside of the component checkpoint. This PR moves the certificate playbooks inside their respective config.yml playbook.
Removes an unused tasks file from the openshift_named_certificates role.
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 10 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 4ca0d48e4..96a43230d 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 @@ -30,16 +26,10 @@ - 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 -- include: ../openshift-node/certificates.yml - - include: ../openshift-node/config.yml - include: ../openshift-glusterfs/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 |