Selaa lähdekoodia

Fix package management

When possible use generic package manager
When not split out Fedora to dnf
Dan Ragnar 7 vuotta sitten
vanhempi
commit
50fe1be0b3

+ 2 - 2
tasks/CentOS/dashboard.yml

@@ -5,13 +5,13 @@
   - include_vars: "{{ ansible_distribution }}.yml"
 
   - name: Ensure Uchiwa is installed
-    yum:
+    package:
       name: uchiwa
       state: present
     when: not se_enterprise
 
   - name: Ensure Sensu Enterprise Dashboard is installed
-    yum:
+    package:
       name: "{{ sensu_enterprise_dashboard_package }}"
       state: present
     when: se_enterprise

+ 2 - 2
tasks/CentOS/main.yml

@@ -55,12 +55,12 @@
     when: se_enterprise
 
   - name: Ensure Sensu is installed
-    yum:
+    package:
       name: "{{sensu_package }}-{{sensu_pkg_version}}"
       state: "{{ sensu_pkg_state }}"
 
   - name: Ensure Sensu Enterprise is installed
-    yum:
+    package:
       name={{ sensu_enterprise_package }}
       state={{ sensu_pkg_state }}
     when: se_enterprise

+ 3 - 3
tasks/Fedora/rabbit.yml

@@ -1,6 +1,6 @@
 ---
-# tasks/CentOS/rabbit.yml: Deploy RabbitMQ
-# Specific to CentOS
+# tasks/Fedora/rabbit.yml: Deploy RabbitMQ
+# Specific to Fedora
 
   - include_vars: "{{ ansible_distribution }}.yml"
 
@@ -23,7 +23,7 @@
       repo_gpgcheck: no
 
   - name: Ensure Erlang & RabbitMQ are installed
-    yum:
+    dnf:
       name:
         - erlang
         - rabbitmq-server

+ 0 - 1
tasks/Fedora/redis.yml

@@ -1 +0,0 @@
-../CentOS/redis.yml

+ 23 - 0
tasks/Fedora/redis.yml

@@ -0,0 +1,23 @@
+---
+# tasks/Fedora/redis.yml: Deploy redis
+# Specific to Fedora
+
+  - 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:
+      dest: /etc/redis.conf
+      regexp: '^bind'
+      line: 'bind 0.0.0.0'