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 /roles/openshift_ca | |
| 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 'roles/openshift_ca')
| -rw-r--r-- | roles/openshift_ca/defaults/main.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_ca/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_ca/vars/main.yml | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_ca/defaults/main.yml b/roles/openshift_ca/defaults/main.yml index ecfcc88b3..742b15df4 100644 --- a/roles/openshift_ca/defaults/main.yml +++ b/roles/openshift_ca/defaults/main.yml @@ -1,3 +1,11 @@ --- openshift_ca_cert_expire_days: 1825 openshift_master_cert_expire_days: 730 + +openshift_ca_config_dir: "{{ openshift.common.config_base }}/master" +openshift_ca_cert: "{{ openshift_ca_config_dir }}/ca.crt" +openshift_ca_key: "{{ openshift_ca_config_dir }}/ca.key" +openshift_ca_serial: "{{ openshift_ca_config_dir }}/ca.serial.txt" +openshift_master_loopback_config: "{{ openshift_ca_config_dir }}/openshift-master.kubeconfig" + +openshift_version: "{{ openshift_pkg_version | default('') }}" diff --git a/roles/openshift_ca/meta/main.yml b/roles/openshift_ca/meta/main.yml index dfbdf0cc7..f8b784a63 100644 --- a/roles/openshift_ca/meta/main.yml +++ b/roles/openshift_ca/meta/main.yml @@ -14,4 +14,3 @@ galaxy_info: - system dependencies: - role: openshift_cli -- role: openshift_named_certificates diff --git a/roles/openshift_ca/vars/main.yml b/roles/openshift_ca/vars/main.yml index d04c1766d..4d80bf921 100644 --- a/roles/openshift_ca/vars/main.yml +++ b/roles/openshift_ca/vars/main.yml @@ -1,9 +1,2 @@ --- -openshift_ca_config_dir: "{{ openshift.common.config_base }}/master" -openshift_ca_cert: "{{ openshift_ca_config_dir }}/ca.crt" -openshift_ca_key: "{{ openshift_ca_config_dir }}/ca.key" -openshift_ca_serial: "{{ openshift_ca_config_dir }}/ca.serial.txt" -openshift_version: "{{ openshift_pkg_version | default('') }}" - -openshift_master_loopback_config: "{{ openshift_ca_config_dir }}/openshift-master.kubeconfig" loopback_context_string: "current-context: {{ openshift.master.loopback_context_name }}" |