Merge pull request #268 from amanda11/remove_centos6

armab · web-flow · commit 5dbabb952dc9 · 2020-07-01T12:23:29.000+01:00
Remove EL6 from ansible playbooks
diff --git a/.kitchen-docker/centos6/Dockerfile b/.kitchen-docker/centos6/Dockerfile
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -31,12 +31,6 @@ platforms:
       run_command: /sbin/init
       volume:
         - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  # CentOS6 with sysV init
-  - name: centos-6
-    driver_config:
-      platform: centos
-      dockerfile: .kitchen-docker/centos6/Dockerfile
-      run_command: /usr/sbin/sshd -D
   # CentOS7 with Systemd
   - name: centos-7
     driver_config:
diff --git a/.travis.yml b/.travis.yml
@@ -10,13 +10,11 @@ branches:
 env:
   # default is stable repo
   - DISTRO=ubuntu-16 LICENSE='BWC_LICENSE_ENTERPRISE'
-  - DISTRO=centos-6 LICENSE='BWC_LICENSE_ENTERPRISE'
   - DISTRO=centos-7 LICENSE='BWC_LICENSE_ENTERPRISE'
   - DISTRO=centos-8 LICENSE='BWC_LICENSE_ENTERPRISE'
 
   # StackStorm 'unstable' repo check
   - DISTRO=ubuntu-16 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
-  - DISTRO=centos-6 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
   - DISTRO=centos-7 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
   - DISTRO=centos-8 ST2_REPO=unstable EWC_REPO=enterprise-unstable LICENSE='BWC_LICENSE_ENTERPRISE_UNSTABLE'
 
diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@ Aka IFTTT orchestration for Ops.
 
 ## Supported platforms
 * Ubuntu Xenial (16.04)
-* RHEL6 / CentOS6
 * RHEL7 / CentOS7
 * RHEL8 / CentOS8
 
@@ -45,7 +44,7 @@ Below is the list of variables you can redefine in your playbook to customize st
 | `st2_auth_username`      | `testu`       | Username used by StackStorm standalone authentication.
 | `st2_auth_password`      | `testp`       | Password used by StackStorm standalone authentication.
 | `st2_save_credentials`   | `yes`         | Save credentials for local CLI in `/root/.st2/config` file.
-| `st2_packs`              | `[ st2 ]`     | List of packs to install. This flag does not work on CentOS6 or with a `--python3` only pack.
+| `st2_packs`              | `[ st2 ]`     | List of packs to install. This flag does not work with a `--python3` only pack.
 | **st2mistral**
 | `st2mistral_version`     | `latest`      | st2mistral version to install. `present` to install available package, `latest` to get automatic updates, or pin it to numeric version like `2.2.0`.
 | `st2mistral_db`          | `mistral`     | PostgreSQL DB name that will be created for Mistral.
@@ -101,10 +100,8 @@ There are a few requirements when developing on `ansible-st2`.
 
 These are the platforms we must support (must pass end-to-end testing):
 - Xenial
-- CentOS6
 - CentOS7
 - CentOS8
-- RHEL6 (via AWS)
 - RHEL7 (via AWS)
 - RHEL8 (via AWS)
 
@@ -117,7 +114,6 @@ vagrant up
 
 Other distros:
 ```sh
-vagrant up centos6
 vagrant up centos7
 vagrant up centos8
 ```
@@ -132,7 +128,6 @@ You might be interested in other methods to deploy StackStorm engine:
   * [Ubuntu 16.04](https://docs.stackstorm.com/install/deb.html)
   * [RHEL8/CentOS8](https://docs.stackstorm.com/install/rhel8.html)
   * [RHEL7/CentOS7](https://docs.stackstorm.com/install/rhel7.html)
-  * [RHEL6/CentOS6](https://docs.stackstorm.com/install/rhel6.html)
 
 ## Help
 If you're in stuck, our community always ready to help, feel free to:
diff --git a/Vagrantfile b/Vagrantfile
@@ -6,10 +6,6 @@ VIRTUAL_MACHINES = {
     :hostname => 'ansible-st2-ubuntu16',
     :box => 'ubuntu/xenial64',
   },
-  :centos6 => {
-    :hostname => 'ansible-st2-centos6',
-    :box => 'centos/6',
-  },
   :centos7 => {
     :hostname => 'ansible-st2-centos7',
     :box => 'centos/7',
diff --git a/meta/main.yml b/meta/main.yml
@@ -19,7 +19,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   categories:
diff --git a/roles/StackStorm.epel/meta/main.yml b/roles/StackStorm.epel/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.ewc/meta/main.yml b/roles/StackStorm.ewc/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.ewc_smoketests/meta/main.yml b/roles/StackStorm.ewc_smoketests/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.mongodb/meta/main.yml b/roles/StackStorm.mongodb/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.nginx/meta/main.yml b/roles/StackStorm.nginx/meta/main.yml
@@ -12,7 +12,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.nodejs/meta/main.yml b/roles/StackStorm.nodejs/meta/main.yml
@@ -12,7 +12,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.postgresql/meta/main.yml b/roles/StackStorm.postgresql/meta/main.yml
@@ -12,7 +12,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
   galaxy_tags:
     - system
diff --git a/roles/StackStorm.postgresql/tasks/postgresql_yum6.yml b/roles/StackStorm.postgresql/tasks/postgresql_yum6.yml
diff --git a/roles/StackStorm.rabbitmq/meta/main.yml b/roles/StackStorm.rabbitmq/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.rabbitmq/tasks/main.yml b/roles/StackStorm.rabbitmq/tasks/main.yml
@@ -57,7 +57,5 @@
     state: enabled
     # new_only: no = Remove all plguins that aren't listed in rabbitmq_plugins
     new_only: no
-    # the EL6 RPM for rabbitmq-server does not place the rabbitmq-plugins binary in the search path (other distro's packages do, including EL7). Prefix adds it to the binary search path.
-    prefix: "{{ rabbitmq_on_el6 | ternary(rabbitmq_el6_prefix, omit) }}"
   when: rabbitmq_plugins | bool
   tags: rabbitmq
diff --git a/roles/StackStorm.rabbitmq/vars/main.yml b/roles/StackStorm.rabbitmq/vars/main.yml
@@ -1,4 +1,2 @@
 ---
-rabbitmq_el6_prefix: "/usr/lib/rabbitmq/"
-rabbitmq_on_el6: "{{ (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '6') }}"
 rabbitmq_on_el8: "{{ (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '8') }}"
diff --git a/roles/StackStorm.st2/meta/main.yml b/roles/StackStorm.st2/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.st2/tasks/main.yml b/roles/StackStorm.st2/tasks/main.yml
@@ -1,16 +1,4 @@
 ---
-- name: Install libffi-devel on EL6
-  become: yes
-  package:
-    name: http://rpmfind.net/linux/centos/6/os/x86_64/Packages/libffi-devel-3.0.5-3.2.el6.x86_64.rpm
-    state: present
-  register: _task
-  retries: 5
-  delay: 3
-  until: _task is succeeded
-  when: ansible_facts.os_family == "RedHat" and ansible_facts.distribution_major_version == "6"
-  tags: st2
-
 - name: Install latest st2 package, auto-update
   become: yes
   package:
@@ -105,19 +93,12 @@
 # https://github.com/ansible/ansible/issues/41313#issuecomment-520891625
 - name: Flush handlers to prepare StackStorm if there are packs to install
   include_tasks: flush_handlers.yml
-  when: st2_packs|length > 0 and not (ansible_facts.os_family == "RedHat" and ansible_distribution_major_version == "6")
+  when: st2_packs|length > 0
   ignore_errors: yes
-  tags: st2, st2_packs, skip_centos_6
+  tags: st2, st2_packs
 
 - name: Install StackStorm integration Packs
   import_tasks: packs.yml
-  when: st2_packs|length > 0 and not (ansible_facts.os_family == "RedHat" and ansible_distribution_major_version == "6")
-  ignore_errors: yes
-  tags: st2, st2_packs, skip_centos_6
-
-- name: Report warning when 'st2_packs' is used in EL6
-  fail:
-    msg: CentOS/RHEL 6 support not provided for 'st2_packs', skipped st2 pack install
-  failed_when: st2_packs|length > 0 and ansible_facts.os_family == "RedHat" and ansible_distribution_major_version == "6"
+  when: st2_packs|length > 0
   ignore_errors: yes
-  tags: st2, st2_packs, skip_centos_6
+  tags: st2, st2_packs
diff --git a/roles/StackStorm.st2chatops/meta/main.yml b/roles/StackStorm.st2chatops/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.st2mistral/meta/main.yml b/roles/StackStorm.st2mistral/meta/main.yml
@@ -12,7 +12,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
   galaxy_tags:
     - system
diff --git a/roles/StackStorm.st2repo/meta/main.yml b/roles/StackStorm.st2repo/meta/main.yml
@@ -11,7 +11,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
diff --git a/roles/StackStorm.st2web/meta/main.yml b/roles/StackStorm.st2web/meta/main.yml
@@ -12,7 +12,6 @@ galaxy_info:
         - xenial
     - name: EL
       versions:
-        - 6
         - 7
         - 8
   galaxy_tags:
