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-master | |
| 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-master')
| -rw-r--r-- | playbooks/common/openshift-master/ca.yml | 8 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/playbooks/common/openshift-master/ca.yml b/playbooks/common/openshift-master/ca.yml deleted file mode 100644 index 5bb796fa3..000000000 --- a/playbooks/common/openshift-master/ca.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Create OpenShift CA - hosts: oo_masters_to_config - roles: - - role: openshift_master_facts - - role: openshift_named_certificates - - role: openshift_ca - openshift_ca_host: "{{ groups.oo_first_master.0 }}" diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 766e0e501..bc1fee982 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -10,6 +10,8 @@ installer_phase_master: "In Progress" aggregate: false +- include: certificates.yml + - name: Disable excluders hosts: oo_masters_to_config gather_facts: no diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index d007fac85..f4dc9df8a 100644 --- a/playbooks/common/openshift-master/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -47,8 +47,6 @@ - include: ../openshift-etcd/certificates.yml -- include: ../openshift-master/certificates.yml - - include: ../openshift-master/config.yml - include: ../openshift-loadbalancer/config.yml |