Merge pull request #8072 from mgugino-upstream-stage/remove-meta-etcd-role

Remove meta openshift_etcd role

playbooks/openshift-etcd/private/config.yml

@@ -18,12 +18,16 @@
 - name: Configure etcd
   hosts: oo_etcd_to_config
   any_errors_fatal: true
-  roles:
-  - role: openshift_clock
-  - role: openshift_etcd
-    etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}"
-    etcd_certificates_etcd_hosts: "{{ groups.oo_etcd_to_config | default([], true) }}"
-  - role: nickhammond.logrotate
+  tasks:
+  - import_role:
+      name: openshift_clock
+  - import_role:
+      name: etcd
+    vars:
+      etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}"
+      etcd_certificates_etcd_hosts: "{{ groups.oo_etcd_to_config | default([], true) }}"
+  - import_role:
+      name: nickhammond.logrotate
 
 - name: etcd Install Checkpoint End
   hosts: all

playbooks/openshift-etcd/private/scaleup.yml

@@ -13,19 +13,25 @@
     vars:
       etcd_peers: "{{ groups.oo_new_etcd_to_config | default([], true) }}"
       etcd_certificates_etcd_hosts: "{{ groups.oo_new_etcd_to_config | default([], true) }}"
-  roles:
-  - role: os_firewall
+  tasks:
+  - import_role:
+      name: os_firewall
     when: etcd_add_check.rc == 0
-  - role: openshift_etcd
+
+  - import_role:
+      name: etcd
     when: etcd_add_check.rc == 0
-    etcd_peers: "{{ groups.oo_etcd_to_config | union(groups.oo_new_etcd_to_config)| default([], true) }}"
-    etcd_certificates_etcd_hosts: "{{ groups.oo_etcd_to_config | default([], true) }}"
-    etcd_initial_cluster_state: "existing"
-    etcd_initial_cluster: "{{ etcd_add_check.stdout_lines[3] | regex_replace('ETCD_INITIAL_CLUSTER=','') | regex_replace('\"','') }}"
-    etcd_ca_setup: False
-  - role: nickhammond.logrotate
+    vars:
+      etcd_peers: "{{ groups.oo_etcd_to_config | union(groups.oo_new_etcd_to_config)| default([], true) }}"
+      etcd_certificates_etcd_hosts: "{{ groups.oo_etcd_to_config | default([], true) }}"
+      etcd_initial_cluster_state: "existing"
+      etcd_initial_cluster: "{{ etcd_add_check.stdout_lines[3] | regex_replace('ETCD_INITIAL_CLUSTER=','') | regex_replace('\"','') }}"
+      etcd_ca_setup: False
+
+  - import_role:
+      name: nickhammond.logrotate
     when: etcd_add_check.rc == 0
-  post_tasks:
+
   # etcd_hostname fact is set in add_new_member.yml called above.
   - name: Verify cluster is stable
     command: >

roles/openshift_etcd/meta/main.yml

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