From 4f5eed5a81f7cfb3c8f0664c64a5a8a61e2b497c Mon Sep 17 00:00:00 2001
From: jupiter <jupiter@ansible2.(none)>
Date: Wed, 21 Jan 2015 21:23:07 +0000
Subject: [PATCH] add mountFileSystems
---
.../easy-rsa-certificate/tasks/buildCert.yml | 19 +++++++++----------
roles/nfs-server/tasks/mkFilesystem.yml | 8 ++++----
roles/nfs-server/vars/readme.txt | 6 ++++++
3 files changed, 19 insertions(+), 14 deletions(-)
create mode 100644 roles/nfs-server/vars/readme.txt
diff --git a/roles/easy-rsa-certificate/tasks/buildCert.yml b/roles/easy-rsa-certificate/tasks/buildCert.yml
index d71c98a..c9b2f9c 100644
--- a/roles/easy-rsa-certificate/tasks/buildCert.yml
+++ b/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
diff --git a/roles/nfs-server/tasks/mkFilesystem.yml b/roles/nfs-server/tasks/mkFilesystem.yml
index ae917f2..0890414 100644
--- a/roles/nfs-server/tasks/mkFilesystem.yml
+++ b/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
diff --git a/roles/nfs-server/vars/readme.txt b/roles/nfs-server/vars/readme.txt
new file mode 100644
index 0000000..bd410d9
--- /dev/null
+++ b/roles/nfs-server/vars/readme.txt
@@ -0,0 +1,6 @@
+---
+mkFileSystems:
+ - {fstype : 'ext4', dev: '/dev/vdc', opts: '', name: '/mnt'}
+
+mountFileSystems:
+ - {name: '/mnt', fstype : 'ext4', dev: '/dev/vdc', opts: 'defaults,nofail'}
--
GitLab