diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-09-06 10:21:50 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2017-10-02 10:05:44 -0400 |
| commit | d8d0e6d7de600d6896014fef928da5bf133dc85e (patch) | |
| tree | 1b8b802ad1629b5cf23f3e3656d0ee1d7ef76d01 /roles/openshift_ca | |
| parent | 54ea443f4ad24ad311c0a036cf283f9e39c865ee (diff) | |
| download | openshift-d8d0e6d7de600d6896014fef928da5bf133dc85e.tar.gz openshift-d8d0e6d7de600d6896014fef928da5bf133dc85e.tar.bz2 openshift-d8d0e6d7de600d6896014fef928da5bf133dc85e.tar.xz openshift-d8d0e6d7de600d6896014fef928da5bf133dc85e.zip | |
Separate certificate 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 }}" |