Fix delfin os version for 18.04 & 16.04

ansible/group_vars/delfin.yml

@@ -26,7 +26,7 @@ dummy:
 enable_delfin: false
 
 # delfin installation types are: 'repository', 'release' and 'container''
-delfin_installation_type: "repository" # "{{ install_from }}"
+delfin_installation_type: "{{ install_from }}"
 
 # These fields are NOT suggested to be modifie
 delfin_work_dir: /opt/delfin-linux-amd64

ansible/roles/delfin-installer/scenarios/rabbitmq.yml

@@ -23,34 +23,34 @@
 
 - name: Add RabbitMQ official repo
   apt_repository: 
-    repo: deb https://dl.bintray.com/rabbitmq/debian xenial main 
+    repo: deb https://dl.bintray.com/rabbitmq/debian {{ ansible_distribution_release }} main
     state: present
     filename: rabbitmq
   become: yes
   when:
     - rabbitmqservice.stat.exists is undefined or rabbitmqservice.stat.exists == false
 
 - name: Import RabbitMQ public key
-  apt_key: 
+  apt_key:
     url: https://dl.bintray.com/rabbitmq/Keys/rabbitmq-release-signing-key.asc
     state: present
   become: yes
   when:
     - rabbitmqservice.stat.exists is undefined or rabbitmqservice.stat.exists == false
 
-- name: Add Erlang official repo
-  apt_repository: 
-    repo: deb https://binaries.erlang-solutions.com/debian xenial contrib 
+- name: Import Erlang public key
+  apt_key:
+    url: https://packages.erlang-solutions.com/debian/erlang_solutions.asc
     state: present
-    filename: erlang
   become: yes
   when:
     - rabbitmqservice.stat.exists is undefined or rabbitmqservice.stat.exists == false
 
-- name: Import Erlang public key
-  apt_key: 
-    url: https://packages.erlang-solutions.com/debian/erlang_solutions.asc
+- name: Add Erlang official repo
+  apt_repository:
+    repo: deb https://binaries.erlang-solutions.com/debian {{ ansible_distribution_release }} contrib
     state: present
+    filename: erlang
   become: yes
   when:
     - rabbitmqservice.stat.exists is undefined or rabbitmqservice.stat.exists == false