Commit c72eae4c authored by Louis VINCHON's avatar Louis VINCHON
Browse files

Role irods: clean up 'ubuntu' tasks

Remove anything not Ubuntu-specific in the 'ubuntu' folder.
parent b1db1538
......@@ -4,4 +4,8 @@
import_tasks: centos/main.yml
when: ansible_facts['distribution'] == "CentOS"
- name: Install iRODS for Ubuntu.
import_tasks: ubuntu/main.yml
when: ansible_facts['distribution'] == "Ubuntu"
...
......@@ -3,7 +3,6 @@
- import_tasks: group_user.yml
- import_tasks: repos.yml
- import_tasks: packages.yml
- import_tasks: security.yml
- import_tasks: pip.yml
- import_tasks: irods_config.yml
......
---
- name: Install iRODS packages and misc. on CentOS
package:
name:
- libselinux-python
- python-pip
- irods-server-{{ irods_version }}
- irods-database-plugin-postgres-{{ irods_version }}
state: present
when: ansible_facts['distribution'] == "CentOS"
- name: Install iRODS packages and misc. on Ubuntu
package:
name:
......@@ -18,6 +8,5 @@
- irods-server={{ irods_version }}
- irods-database-plugin-postgres={{ irods_version }}
state: present
when: ansible_facts['distribution'] == "Ubuntu"
...
---
- name: Add key and iRODS repository on CentOS 7
block:
- name: Add key for iRODS repository on CentOS 7
rpm_key:
state: present
key: https://packages.irods.org/irods-signing-key.asc
validate_certs: yes
- name: Add iRODS repository on CentOS 7
yum_repository:
description: RENCI iRODS Repository
name: irods
file: renci-irods.yum
baseurl: https://packages.irods.org/yum/pool/centos$releasever/$basearch
enabled: yes
gpgcheck: no
gpgkey: https://packages.irods.org/irods-signing-key.asc
repo_gpgcheck: no
state: present
when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] == "7" and not use_local_mirror)
- name: Add key and iRODS repository on Debian / Ubuntu
block:
- name: Add key for iRODS repository on Debian / Ubuntu
......@@ -36,7 +15,6 @@
filename: renci-irods
update_cache: true
validate_certs: yes
when: ansible_facts['distribution'] == "Ubuntu"
...
---
- name: Set SELinux mode on CentOS
selinux:
policy: targeted
state: "{{ selinux_mode }}"
when: ansible_facts['distribution'] == "CentOS"
...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment