Ensure that RedHat/SUSE only use a distro install
Previously the 'distro' install method was implemented as the default for CentOS and SUSE, however, some remnants were left behind, making the configuration confusing and causing some issues due to the gpg verification on RedHat trying to use the RabbitMQ gpg check. Rather than try and keep the many confusing installation methods for these distributions, we simply remove the other options and all the config entries related to it. As part of this, we need to clean up the functional tests which previously implemented checks based on the 'file' install type which is no longer used by any distribution. Change-Id: I28199ce149f6893d688d11177ec950b17dbf0886
This commit is contained in:
committed by
Jesse Pretorius
parent
95b298dcd1
commit
cfc8423bfd
@@ -20,32 +20,6 @@
|
||||
gather_facts: true
|
||||
become: true
|
||||
tasks:
|
||||
|
||||
- name: Gather variables for each operating system
|
||||
include_vars: "{{ item }}"
|
||||
with_first_found:
|
||||
- "{{ playbook_dir }}/../vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
|
||||
- "{{ playbook_dir }}/../vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
|
||||
- "{{ playbook_dir }}/../vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
|
||||
- "{{ playbook_dir }}/../vars/{{ ansible_distribution | lower }}.yml"
|
||||
- "{{ playbook_dir }}/../vars/{{ ansible_os_family | lower }}.yml"
|
||||
|
||||
- name: Set rabbitmq_package_url
|
||||
set_fact:
|
||||
rabbitmq_package_url: "{{ _rabbitmq_package_url }}"
|
||||
|
||||
- name: Set rabbitmq_package_version
|
||||
set_fact:
|
||||
rabbitmq_package_version: "{{ _rabbitmq_package_version }}"
|
||||
|
||||
- name: Set rabbitmq_release_version
|
||||
set_fact:
|
||||
rabbitmq_release_version: "{{ _rabbitmq_release_version }}"
|
||||
|
||||
- name: Set rabbitmq_install_method
|
||||
set_fact:
|
||||
rabbitmq_install_method: "{{ _rabbitmq_install_method }}"
|
||||
|
||||
- name: Check rabbitmq is running
|
||||
command: "pgrep -f rabbit"
|
||||
delegate_to: "{{ item }}"
|
||||
@@ -102,12 +76,6 @@
|
||||
- hostvars['container1']['rabbitmq_ssl_cert_checksum'] == hostvars['container2']['rabbitmq_ssl_cert_checksum'] == hostvars['container3']['rabbitmq_ssl_cert_checksum']
|
||||
- hostvars['container1']['rabbitmq_ssl_key_checksum'] == hostvars['container2']['rabbitmq_ssl_key_checksum'] == hostvars['container3']['rabbitmq_ssl_key_checksum']
|
||||
|
||||
- name: Ensure expected version of rabbitmq is running
|
||||
assert:
|
||||
that: rabbitmqctl_status.stdout | search ("rabbit,\"RabbitMQ\",\"{{ _rabbitmq_release_version }}\"")
|
||||
when:
|
||||
- "rabbitmq_install_method == 'file'"
|
||||
|
||||
- name: Get the policy list
|
||||
command: rabbitmqctl -q list_policies
|
||||
register: rabbitmq_policies_output
|
||||
|
||||
Reference in New Issue
Block a user