diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-02 12:44:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 12:44:55 -0700 |
| commit | 55617251e6abe5b205122b990c7ddb38bec87330 (patch) | |
| tree | 062fdcb808a3954d5156832d84b2ff24b5b173b2 /playbooks/common/openshift-master | |
| parent | 125c266f8f9149d773683a6e4b2fbacf2b557005 (diff) | |
| parent | d8d0e6d7de600d6896014fef928da5bf133dc85e (diff) | |
| download | openshift-55617251e6abe5b205122b990c7ddb38bec87330.tar.gz openshift-55617251e6abe5b205122b990c7ddb38bec87330.tar.bz2 openshift-55617251e6abe5b205122b990c7ddb38bec87330.tar.xz openshift-55617251e6abe5b205122b990c7ddb38bec87330.zip | |
Merge pull request #5510 from abutcher/separate-certs
Automatic merge from submit-queue.
Break out certificate playbooks
Break out certificate role dependencies and move them into their own playbooks.
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/ca.yml | 8 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/certificates.yml | 14 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 9 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 6 |
4 files changed, 28 insertions, 9 deletions
diff --git a/playbooks/common/openshift-master/ca.yml b/playbooks/common/openshift-master/ca.yml new file mode 100644 index 000000000..5bb796fa3 --- /dev/null +++ b/playbooks/common/openshift-master/ca.yml @@ -0,0 +1,8 @@ +--- +- 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/certificates.yml b/playbooks/common/openshift-master/certificates.yml new file mode 100644 index 000000000..f6afbc36f --- /dev/null +++ b/playbooks/common/openshift-master/certificates.yml @@ -0,0 +1,14 @@ +--- +- name: Create OpenShift certificates for master hosts + hosts: oo_masters_to_config + vars: + openshift_ca_host: "{{ groups.oo_first_master.0 }}" + roles: + - role: openshift_master_facts + - role: openshift_named_certificates + - role: openshift_ca + - role: openshift_master_certificates + openshift_master_etcd_hosts: "{{ hostvars + | oo_select_keys(groups['oo_etcd_to_config'] | default([])) + | oo_collect('openshift.common.hostname') + | default(none, true) }}" diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 3904d85cb..766e0e501 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -180,15 +180,6 @@ - role: os_firewall - role: openshift_master_facts - role: openshift_hosted_facts - - role: openshift_master_certificates - - role: openshift_etcd_facts - - role: openshift_etcd_client_certificates - etcd_cert_subdir: "openshift-master-{{ openshift.common.hostname }}" - etcd_cert_config_dir: "{{ openshift.common.config_base }}/master" - etcd_cert_prefix: "master.etcd-" - r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" - etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" - when: groups.oo_etcd_to_config | default([]) | length != 0 - role: openshift_clock - role: openshift_cloud_provider - role: openshift_builddefaults diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index 8c366e038..d007fac85 100644 --- a/playbooks/common/openshift-master/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -45,8 +45,14 @@ - include: ../openshift-master/set_network_facts.yml +- include: ../openshift-etcd/certificates.yml + +- include: ../openshift-master/certificates.yml + - include: ../openshift-master/config.yml - include: ../openshift-loadbalancer/config.yml +- include: ../openshift-node/certificates.yml + - include: ../openshift-node/config.yml |