Преглед изворни кода

Remove EPEL for Fedora and fix rabbit repo link

Dan Ragnar пре 8 година
родитељ
комит
ef1cedc02b
3 измењених фајлова са 2 додато и 13 уклоњено
  1. 2 3
      tasks/Fedora/rabbit.yml
  2. 0 7
      tasks/Fedora/redis.yml
  3. 0 3
      vars/Fedora.yml

+ 2 - 3
tasks/Fedora/rabbit.yml

@@ -8,7 +8,7 @@
     yum_repository:
       name: rabbitmq
       description: rabbitmq
-      baseurl: "https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.7.x/el/{{ansible_distribution_major_version}}"
+      baseurl: "https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.7.x/el/7"
       gpgcheck: yes
       gpgkey: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
       repo_gpgcheck: no
@@ -17,7 +17,7 @@
     yum_repository:
       name: rabbitmq-erlang
       description: rabbitmq-erlang
-      baseurl: "https://dl.bintray.com/rabbitmq/rpm/erlang/19/el/{{ansible_distribution_major_version}}"
+      baseurl: "https://dl.bintray.com/rabbitmq/rpm/erlang/19/el/7"
       gpgcheck: yes
       gpgkey: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
       repo_gpgcheck: no
@@ -29,7 +29,6 @@
         - rabbitmq-server
       state: present
       enablerepo: rabbitmq,rabbitmq-erlang
-      disablerepo: epel
 
 
 

+ 0 - 7
tasks/Fedora/redis.yml

@@ -4,17 +4,10 @@
 
   - include_vars: "{{ ansible_distribution }}.yml"
 
-  - name: Install EPEL repo
-    dnf:
-      name: epel-release
-      state: present
-    when: enable_epel_repo
-
   - name: Ensure redis is installed
     dnf:
       name: "{{ redis_pkg_name }}"
       state: "{{ redis_pkg_state }}"
-      enablerepo: "{{ centos_repository }}"
 
   - name: Ensure redis binds to accessible IP
     lineinfile:

+ 0 - 3
vars/Fedora.yml

@@ -5,8 +5,5 @@
 # Sensu/Uchiwa user/group/service properties
 _sensu_pkg_version: '1.2.1'
 
-#Set this to false to disable the EPEL repo installation
-enable_epel_repo: true
-
 #RH/Centos 7 version works for Fedora 25 as a client
 sensu_yum_repo_url: "https://sensu.global.ssl.fastly.net/yum/7/$basearch/"