3 files changed, 6 insertions, 38 deletions
diff --git a/roles/openshift_named_certificates/defaults/main.yml b/roles/openshift_named_certificates/defaults/main.yml
new file mode 100644
index 000000000..a32e385ec
--- /dev/null
+++ b/roles/openshift_named_certificates/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+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('') }}"
diff --git a/roles/openshift_named_certificates/tasks/named_certificates.yml b/roles/openshift_named_certificates/tasks/named_certificates.yml
deleted file mode 100644
index 7b097b443..000000000
--- a/roles/openshift_named_certificates/tasks/named_certificates.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-- name: Clear named certificates
-  file:
-    path: "{{ named_certs_dir }}"
-    state: absent
-  when: overwrite_named_certs | bool
-
-- name: Ensure named certificate directory exists
-  file:
-    path: "{{ named_certs_dir }}"
-    state: directory
-    mode: 0700
-
-- name: Land named certificates
-  copy:
-    src: "{{ item.certfile }}"
-    dest: "{{ named_certs_dir }}"
-  with_items: "{{ openshift_master_named_certificates | default([]) }}"
-
-- name: Land named certificate keys
-  copy:
-    src: "{{ item.keyfile }}"
-    dest: "{{ named_certs_dir }}"
-    mode: 0600
-  with_items: "{{ openshift_master_named_certificates | default([]) }}"
-
-- name: Land named CA certificates
-  copy:
-    src: "{{ item }}"
-    dest: "{{ named_certs_dir }}"
-    mode: 0600
-  with_items: "{{ openshift_master_named_certificates | default([]) | oo_collect('cafile') }}"
diff --git a/roles/openshift_named_certificates/vars/main.yml b/roles/openshift_named_certificates/vars/main.yml
index 368e9bdac..7f891441d 100644
--- a/roles/openshift_named_certificates/vars/main.yml
+++ b/roles/openshift_named_certificates/vars/main.yml
@@ -1,10 +1,4 @@
 ---
-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('') }}"
-
 overwrite_named_certs: "{{ openshift_master_overwrite_named_certificates | default(false) }}"
 named_certs_dir: "{{ openshift.common.config_base }}/master/named_certificates/"
 internal_hostnames: "{{ openshift.common.internal_hostnames }}"