Merge pull request #44 from CVL-GitHub/nagiosBranch2

add mountFileSystems

roles/easy-rsa-certificate/tasks/buildCert.yml

@@ -53,18 +53,17 @@
 - name: "Create node tmp directory"
   delegate_to: 127.0.0.1
   shell: "mkdir -p /tmp/{{ inventory_hostname }} ; chmod 755 /tmp/{{ inventory_hostname }}"
-  when: x509_ca_server != inventory_hostname
 
 - name: "Copy CSR to ansible host"
   fetch: "src=/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.csr dest=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.csr fail_on_missing=yes validate_md5=yes flat=yes"
   sudo: true
-  when: needcert and x509_ca_server != inventory_hostname
+  when: needcert
 
 - name: "Copy CSR to CA"
   remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
   delegate_to: "{{ x509_ca_server }}"
   copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.csr dest=/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.csr force=yes"
-  when: needcert and x509_ca_server != inventory_hostname
+  when: needcert
   sudo: true
 
 - name: "Sign Certificate"
@@ -79,35 +78,35 @@
   delegate_to: "{{ x509_ca_server }}"
   fetch: "src=/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.crt dest=/tmp/{{ inventory_hostname }}/{{ x509_common_name }}.crt fail_on_missing=yes validate_md5=yes flat=yes"
   sudo: true
-  when: needcert and x509_ca_server != inventory_hostname
+  when: needcert
 
 - name: "Copy the CA Certificate to the ansible host"
   remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
   delegate_to: "{{ x509_ca_server }}"
   fetch: "src=/etc/easy-rsa/2.0/keys/ca.crt dest=/tmp/{{ inventory_hostname }}/ca.crt fail_on_missing=yes validate_md5=yes flat=yes"
   sudo: true
-  when: ca_cert.stat.exists == false and x509_ca_server != inventory_hostname
+  when: "ca_cert.stat.exists == false"
 
 - name: "Make sure the path to the certificate exists"
   shell: "mkdir -p `dirname {{ x509_cert_file }}` ; chmod 755  `dirname {{ x509_cert_file }}`"
-  sudo: true 
+  sudo: true
 
 - name: "Copy the certificate to the node"
   copy: "src=/tmp/{{ inventory_hostname }}/{{ x509_common_name }}.crt dest=/tmp/{{ x509_common_name }}.crt force=yes"
   sudo: true
-  when: needcert and x509_ca_server != inventory_hostname
+  when: needcert
 
 - name: "Copy the certificate to the right location"
   shell: "cp -f /tmp/{{ x509_common_name }}.crt {{ x509_cert_file }}"
   sudo: true
-  when: needcert and x509_ca_server != inventory_hostname
+  when: needcert
 
 - name: "Copy the CA certificate to the node"
   copy: "src=/tmp/{{ inventory_hostname }}/ca.crt dest={{ x509_cacert_file }}"
   sudo: true
-  when: ca_cert.stat.exists == false and x509_ca_server != inventory_hostname
+  when: "ca_cert.stat.exists == false"
 
 - name: "Copy the key to the correct location"
   shell: "mkdir -p `dirname {{ x509_key_file }}` ; chmod 700 `dirname {{ x509_key_file }}` ; cp /etc/easy-rsa/2.0/keys/{{ x509_common_name }}.key {{ x509_key_file }}"
   sudo: true
-  when: needcert and x509_ca_server != inventory_hostname
+  when: needcert

roles/nfs-server/tasks/mkFilesystem.yml

@@ -3,11 +3,11 @@
   filesystem: fstype={{ item.fstype }} dev={{ item.dev }} opts={{ item.opts }}
   with_items: mkFileSystems
   sudo: true
-  when: configDiskDevice
+  when: configDiskDevice or mkFileSystems is defined
 
 - name: Mount device 
-  mount: name={{ item.name }} src={{ item.dev }} fstype={{ item.fstype }} opts={{ item.mntopts }} state=mounted
-  with_items: mkFileSystems
+  mount: name={{ item.name }} src={{ item.dev }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
+  with_items: mountFileSystems
   sudo: true
-  when: configDiskDevice
+  when: configDiskDevice or mountFileSystems is defined
 

roles/nfs-server/vars/readme.txt

+---
+mkFileSystems:
+  - {fstype : 'ext4', dev: '/dev/vdc', opts: '', name: '/mnt'}
+
+mountFileSystems:
+  - {name: '/mnt', fstype : 'ext4', dev: '/dev/vdc', opts: 'defaults,nofail'}