#8 tweak templates, add irods as db-migrations prereq

ansible/playbooks/prereqs.yaml

@@ -5,3 +5,4 @@
 - include: postgres.yaml
 - include: condor.yaml
 - include: docker.yaml
+- include: irods.yml

ansible/roles/irods/defaults/main.yml

@@ -1,8 +1,8 @@
 # basic defaults
 irods_icat_pkg: ftp://ftp.renci.org/pub/irods/releases/4.1.6/ubuntu14/irods-icat-4.1.6-ubuntu14-x86_64.deb
-irods_icat_rpm: ftp://ftp.renci.org/pub/irods/releases/4.1.7/centos7/irods-icat-4.1.7-centos7-x86_64.rpm
+irods_icat_rpm: ftp://ftp.renci.org/pub/irods/releases/4.1.8/centos7/irods-icat-4.1.8-centos7-x86_64.rpm
 irods_postgres_pkg: ftp://ftp.renci.org/pub/irods/releases/4.1.6/ubuntu14/irods-database-plugin-postgres-1.6-ubuntu14-x86_64.deb
-irods_postgres_rpm: ftp://ftp.renci.org/pub/irods/releases/4.1.7/centos7/irods-database-plugin-postgres93-1.7-centos7-x86_64.rpm
+irods_postgres_rpm: ftp://ftp.renci.org/pub/irods/releases/4.1.8/centos7/irods-database-plugin-postgres93-1.8-centos7-x86_64.rpm
 icat_pkg: irods-icat-4.1.6-ubuntu14-x86_64.deb
 postgres_pkg: irods-database-plugin-postgres-1.6-ubuntu14-x86_64.deb
 #postgresql_listen_addresses: "*"

ansible/roles/irods/tasks/main.yml

@@ -2,6 +2,12 @@
 
 ### do we want the irods database hosted locally, or on de-db?
 
+- name: ensure epel-release is installed for irods dependencies below
+  yum: name=epel-release state=latest
+  when: ansible_os_family == "RedHat" and
+        ansible_distribution_major_version == "7"
+  tags: irods
+
 - name: ensure pyscopg2 is installed for ansible postgres module
   yum: name=python-psycopg2 state=latest
   when: ansible_os_family == "RedHat" and
@@ -110,6 +116,16 @@
   when: ansible_os_family == 'RedHat' and
         ansible_distribution_major_version == '7'
 
+- name: ensure irods group exists
+  group: name={{ irods_admin }} state=present
+  when: ansible_os_family == 'RedHat' and
+        ansible_distribution_major_version == '7'
+
+- name: ensure irods user exists
+  user: name={{ irods_admin }} state=present group={{ irods_admin }}
+  when: ansible_os_family == 'RedHat' and
+        ansible_distribution_major_version == '7'
+
 - name: Install Postgres Plugin on Debian/Ubuntu
   shell: dpkg -i /home/{{ ansible_ssh_user }}/{{ postgres_pkg }}; apt-get -y -f install
   when: ansible_os_family == 'Debian'

ansible/roles/irods/templates/genresponse.j2

@@ -3,6 +3,7 @@
 
 RESPFILE=$1
 
+# setup_irods.sh seems to want zone first
 echo "{{ irods_service_acct_user }}" > $RESPFILE  	# service account user ID
 echo "{{ irods_service_acct_user }}" >> $RESPFILE 	# service account group ID
 echo "{{ irods_zone }}" >> $RESPFILE            	# initial zone name