Merge branch 'master' of https://github.com/monash-merc/ansible_cluster_in_a_box

roles/OpenVPN-Client/tasks/main.yml

@@ -3,6 +3,6 @@
  include: installOpenVPN.yml
 
 - name: "Start OpenVPN"
-  service: name=openvpn state=started
+  service: name=openvpn state=started enabled=yes
   sudo: true
 

roles/OpenVPN-Server/tasks/main.yml

@@ -3,5 +3,5 @@
  include: installOpenVPN.yml
 
 - name: "Start OpenVPN"
-  service: name=openvpn state=started
+  service: name=openvpn state=started enabled=yes
   sudo: true

roles/apache2/tasks/apacheDebian.yml

@@ -29,6 +29,6 @@
 
 -
  name: "Starting Apache2"
- service: name=apache2 state=started
+ service: name=apache2 state=started enabled=yes
  sudo: true
 

roles/lustre-client/tasks/main.yml

 ---
 - include_vars: "{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yaml"
 
-- name: copy rpms
+- name: copy rpms/debs
   copy: dest=/tmp/ src=lustre-install/{{ item }}
   with_items:
     "{{ lustre_pkgs }}"
 
+
 #- name: install rpms
 #  yum: name="/tmp/{{ item }}"
 #  sudo: true
@@ -14,13 +15,38 @@
 - name: install rpms
   yum: name=/tmp/lustre-client-modules-2.7.0-3.10.0_229.14.1.el7.x86_64.x86_64.rpm
   sudo: true
+  when: ansible_os_family == "RedHat"
 
 - name: install rpms
   yum: name=/tmp/lustre-client-2.7.0-3.10.0_229.14.1.el7.x86_64.x86_64.rpm
   sudo: true
+  when: ansible_os_family == "RedHat"
+
+# instructions to build these debs:
+# Instantiate an Ubuntu 14.04 instance
+# git clone git://git.hpdd.intel.com/fs/lustre-release.git
+# cd lustre-release
+# optionally git checkout 0754bc8f2623bea184111af216f7567608db35b6 <- I know this commit works on Ubuntu, but I had a lot of trouble with other branches
+# sh autogen.sh
+# ./configure --enable-dist --disable-doc  --disable-server --disable-dependency-tracking --with-o2ib=/var/lib/dkms/mlnx-ofed-kernel/3.1/build/
+# mkdir BUILD
+# cd BUILD
+# ln -s ../lustre-2.7.62.tar.gz lustre-2.7.62.orig.tar.gz
+# tar zxvf ../lustre-2.7.62.tar.gz
+# cd lustre-2.7.62
+# ./configure --disable-doc  --disable-server --disable-dependency-tracking --with-o2ib=/var/lib/dkms/mlnx-ofed-kernel/3.1/build/
+# vi debian/changelog (the version number on the first line is incorrect)
+# make debs
+#
+- name: install debs
+  apt: name="/tmp/{{ item }}"
+  sudo: true
+  with_items: "{{ lustre_pkgs }}"
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "14"
 
-  
 - name: "Mount lustre filesystems"
   mount: name="{{ item.mntpt }}" src="{{ item.servers }}"/"{{ item.src }}" state="mounted" fstype="lustre" opts="_netdev,flock" 
   sudo: true
   with_items: "{{ mntlist }}"
+
+

roles/lustre-client/vars/Ubuntu_14.yaml

+---
+lustre_pkgs:
+  - linux-patch-lustre_2.7.62-1_all.deb
+  - lustre-client-modules-3.13.0-58-generic_2.7.62-1_amd64.deb
+  - lustre-utils_2.7.62-1_amd64.deb

roles/nfs-common/handlers/main.yml

 --- 
 - 
   name: "Run rpcbind service"
-  service: "name=rpcbind state=started"
+  service: "name=rpcbind state=started enabled=yes"

roles/nfs-server/tasks/startServer.yml

@@ -5,16 +5,16 @@
   with_items: exportList
 
 - name: "Starting rpcbind"
-  service: "name=rpcbind state=started"
+  service: "name=rpcbind state=started enabled=true"
   sudo: true
   when: ansible_os_family == "RedHat"
 
 - name: "Start the Server"
-  service: "name=nfs state=started"
+  service: "name=nfs state=started enabled=true"
   sudo: true
   when: ansible_os_family == "RedHat"
 
 - name: "Start the Server"
-  service: "name=nfs-kernel-server state=started"
+  service: "name=nfs-kernel-server state=started enabled=true"
   sudo: true
   when: ansible_os_family == "Debian"

roles/shibboleth-sp/tasks/shibbolethConfig.yml

@@ -140,4 +140,4 @@
 -
  name: "Starting shibboleth"
  sudo: true
- service: name=shibd state=started
+ service: name=shibd state=started enabled=yes

roles/slurm-start/tasks/main.yml

@@ -36,7 +36,7 @@
   when: use_systemd is defined
 
 - name: start munge
-  service: name=munge state=started
+  service: name=munge state=started enabled=yes
   sudo: true
 
 - name: start slurmdbd