7330992b20 fixed the major_version compare and made foedora deployments to use setup_redhat8.yml. This however broke the script on fedora as there is no EPEL package. This commit add very basic fedora support.
				
					
				
			This commit is contained in:
		@@ -4,7 +4,10 @@
 | 
			
		||||
  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 8
 | 
			
		||||
 | 
			
		||||
- include_tasks: "{{ role_path }}/tasks/server_base/setup_redhat8.yml"
 | 
			
		||||
  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 7
 | 
			
		||||
  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 7 and ansible_distribution_major_version|int < 30
 | 
			
		||||
 | 
			
		||||
- include_tasks: "{{ role_path }}/tasks/server_base/setup_fedora.yml"
 | 
			
		||||
  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 30
 | 
			
		||||
 | 
			
		||||
- block:
 | 
			
		||||
  # ansible_lsb is only available if lsb-release is installed.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										39
									
								
								roles/matrix-base/tasks/server_base/setup_fedora.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								roles/matrix-base/tasks/server_base/setup_fedora.yml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,39 @@
 | 
			
		||||
---
 | 
			
		||||
 | 
			
		||||
- name: Ensure Docker repository is enabled
 | 
			
		||||
  template:
 | 
			
		||||
    src: "{{ role_path }}/files/yum.repos.d/{{ item }}"
 | 
			
		||||
    dest: "/etc/yum.repos.d/docker-ce.repo"
 | 
			
		||||
    owner: "root"
 | 
			
		||||
    group: "root"
 | 
			
		||||
    mode: 0644
 | 
			
		||||
  with_items:
 | 
			
		||||
    - docker-ce-fedora.repo
 | 
			
		||||
  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 | 
			
		||||
 | 
			
		||||
- name: Ensure Docker's RPM key is trusted
 | 
			
		||||
  rpm_key:
 | 
			
		||||
    state: present
 | 
			
		||||
    key: https://download.docker.com/linux/fedora/gpg
 | 
			
		||||
  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 | 
			
		||||
 | 
			
		||||
- name: Ensure yum packages are installed
 | 
			
		||||
  yum:
 | 
			
		||||
    name:
 | 
			
		||||
      - "{{ matrix_ntpd_package }}"
 | 
			
		||||
    state: latest
 | 
			
		||||
    update_cache: true
 | 
			
		||||
 | 
			
		||||
- name: Ensure Docker is installed
 | 
			
		||||
  yum:
 | 
			
		||||
    name:
 | 
			
		||||
      - "{{ matrix_docker_package_name }}"
 | 
			
		||||
      - python3-pip
 | 
			
		||||
    state: latest
 | 
			
		||||
  when: matrix_docker_installation_enabled|bool
 | 
			
		||||
 | 
			
		||||
- name: Ensure Docker-Py is installed
 | 
			
		||||
  pip:
 | 
			
		||||
    name: docker-py
 | 
			
		||||
    state: latest
 | 
			
		||||
  when: matrix_docker_installation_enabled|bool
 | 
			
		||||
@@ -3,12 +3,12 @@
 | 
			
		||||
- name: Ensure Docker repository is enabled
 | 
			
		||||
  template:
 | 
			
		||||
    src: "{{ role_path }}/files/yum.repos.d/{{ item }}"
 | 
			
		||||
    dest: "/etc/yum.repos.d/{{ item }}"
 | 
			
		||||
    dest: "/etc/yum.repos.d/docker-ce.repo"
 | 
			
		||||
    owner: "root"
 | 
			
		||||
    group: "root"
 | 
			
		||||
    mode: 0644
 | 
			
		||||
  with_items:
 | 
			
		||||
    - docker-ce.repo
 | 
			
		||||
    - docker-ce-centos.repo
 | 
			
		||||
  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 | 
			
		||||
 | 
			
		||||
- name: Ensure Docker's RPM key is trusted
 | 
			
		||||
 
 | 
			
		||||
@@ -3,12 +3,12 @@
 | 
			
		||||
- name: Ensure Docker repository is enabled
 | 
			
		||||
  template:
 | 
			
		||||
    src: "{{ role_path }}/files/yum.repos.d/{{ item }}"
 | 
			
		||||
    dest: "/etc/yum.repos.d/{{ item }}"
 | 
			
		||||
    dest: "/etc/yum.repos.d/docker-ce.repo"
 | 
			
		||||
    owner: "root"
 | 
			
		||||
    group: "root"
 | 
			
		||||
    mode: 0644
 | 
			
		||||
  with_items:
 | 
			
		||||
    - docker-ce.repo
 | 
			
		||||
    - docker-ce-centos.repo
 | 
			
		||||
  when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'
 | 
			
		||||
 | 
			
		||||
- name: Ensure Docker's RPM key is trusted
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user