Merge pull request #8073 from mgugino-upstream-stage/remove-etcd-client-cert-role

Remove meta role openshift_etcd_client_certificates

playbooks/openshift-etcd/private/master_etcd_certificates.yml

@@ -2,9 +2,12 @@
 - name: Create etcd client certificates for master hosts
   hosts: oo_masters_to_config
   any_errors_fatal: true
-  roles:
-    - role: openshift_etcd_client_certificates
+  tasks:
+  - import_role:
+      name: etcd
+      tasks_from: client_certificates.yml
+    vars:
       etcd_cert_subdir: "openshift-master-{{ openshift.common.hostname }}"
       etcd_cert_config_dir: "{{ openshift.common.config_base }}/master"
       etcd_cert_prefix: "master.etcd-"
-      when: groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config
+    when: groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config

playbooks/openshift-node/private/etcd_client_config.yml

@@ -1,8 +1,11 @@
 ---
 - name: etcd_client node config
   hosts: "{{ openshift_node_scale_up_group | default('this_group_does_not_exist') }}"
-  roles:
-  - role: openshift_etcd_client_certificates
-    etcd_cert_prefix: flannel.etcd-
-    etcd_cert_subdir: "openshift-node-{{ openshift.common.hostname }}"
-    etcd_cert_config_dir: "{{ openshift.common.config_base }}/node"
+  tasks:
+  - import_role:
+      name: etcd
+      tasks_from: client_certificates.yml
+    vars:
+      etcd_cert_prefix: flannel.etcd-
+      etcd_cert_subdir: "openshift-node-{{ openshift.common.hostname }}"
+      etcd_cert_config_dir: "{{ openshift.common.config_base }}/node"

roles/openshift_etcd_client_certificates/meta/main.yml

@@ -1,16 +0,0 @@
----
-galaxy_info:
-  author: Jason DeTiberus
-  description: OpenShift Etcd Client Certificates
-  company: Red Hat, Inc.
-  license: Apache License, Version 2.0
-  min_ansible_version: 2.1
-  platforms:
-  - name: EL
-    versions:
-    - 7
-  categories:
-  - cloud
-dependencies:
-- role: lib_utils
-- role: openshift_facts

roles/openshift_etcd_client_certificates/tasks/main.yml

@@ -1,4 +0,0 @@
----
-- import_role:
-    name: etcd
-    tasks_from: client_certificates