Browse Source

CentOS - Pull out RabbitMQ/Erlang repo setup to variables

Jared Ledvina 7 years ago
parent
commit
66b8442074
2 changed files with 13 additions and 9 deletions
  1. 6 9
      tasks/CentOS/rabbit.yml
  2. 7 0
      vars/CentOS.yml

+ 6 - 9
tasks/CentOS/rabbit.yml

@@ -4,31 +4,28 @@
 
 - include_vars: "{{ ansible_distribution }}.yml"
 
-- name: Configure RabbitMQ/RabbitMQ-erlang GPG keys in the RPM keyring
+- name: Configure RabbitMQ GPG keys in the RPM keyring
   rpm_key:
-    key: "{{ item }}"
+    key: "{{ sensu_rabbitmq_signing_key }}"
     state: present
-  with_items:
-    - https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
-    - https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
   register: sensu_rabbitmq_import_key
 
 - name: Add RabbitMQ's repo
   yum_repository:
     name: rabbitmq
     description: rabbitmq
-    baseurl: "https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.7.x/el/{{ansible_distribution_major_version}}"
+    baseurl: "{{ sensu_rabbitmq_baseurl }}"
     gpgcheck: yes
-    gpgkey: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
+    gpgkey: "{{ sensu_rabbitmq_signing_key }}"
     repo_gpgcheck: no
 
 - name: Add RabbitMQ's Erlang repo
   yum_repository:
     name: rabbitmq-erlang
     description: rabbitmq-erlang
-    baseurl: "https://dl.bintray.com/rabbitmq/rpm/erlang/19/el/{{ansible_distribution_major_version}}"
+    baseurl: "{{ sensu_rabbitmq_erlang_baseurl }}"
     gpgcheck: yes
-    gpgkey: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
+    gpgkey: "{{ sensu_rabbitmq_erlang_signing_key }}"
     repo_gpgcheck: no
 
 # HACK: https://github.com/ansible/ansible/issues/20711#issuecomment-306260869

+ 7 - 0
vars/CentOS.yml

@@ -4,3 +4,10 @@
 
 # Set this to false to disable the EPEL repo installation
 enable_epel_repo: true
+
+sensu_rabbitmq_repo_version: v3.7.x
+sensu_rabbitmq_erlang_repo_version: 19
+sensu_rabbitmq_signing_key: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
+sensu_rabbitmq_baseurl: "https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/{{ sensu_rabbitmq_repo_version }}/el/{{ epel_version }}"
+sensu_rabbitmq_erlang_signing_key: "{{ sensu_rabbitmq_signing_key }}"
+sensu_rabbitmq_erlang_baseurl: "https://dl.bintray.com/rabbitmq/rpm/erlang/{{ sensu_rabbitmq_erlang_repo_version }}/el/{{ epel_version }}"