瀏覽代碼

AmazonLinux - Pull out RabbitMQ/Erlang repo setup to variables

Jared Ledvina 7 年之前
父節點
當前提交
45f0f4f494
共有 2 個文件被更改,包括 13 次插入8 次删除
  1. 5 8
      tasks/Amazon/rabbit.yml
  2. 8 0
      vars/Amazon.yml

+ 5 - 8
tasks/Amazon/rabbit.yml

@@ -6,29 +6,26 @@
 
 - name: Configure RabbitMQ/RabbitMQ-erlang 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/{{ epel_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/{{ epel_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

+ 8 - 0
vars/Amazon.yml

@@ -10,3 +10,11 @@ sensu_yum_repo_url: "https://sensu.global.ssl.fastly.net/yum/{{epel_version}}/$b
 # Set this to false to disable the EPEL repo installation
 enable_epel_repo: true
 epel_repo_rpm: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{epel_version}}.noarch.rpm"
+
+# RabbitMQ/Erlang
+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 }}"