From 31666201ef953ee35edf0c21ddad4b8e7464c80c Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Thu, 8 Jan 2015 01:15:26 +0000
Subject: [PATCH] clean up
---
roles/OpenVPN-Server/meta/main.yml | 1 -
roles/easy-rsa-certificate/tasks/buildCert.yml | 12 ------------
roles/etcHosts/defaults/main.yml | 3 ---
roles/etcHosts/tasks/main.yml | 3 ---
roles/slurm-build/tasks/main.yml | 1 -
roles/syncExports/templates/exports.j2 | 11 +++++++++--
6 files changed, 9 insertions(+), 22 deletions(-)
delete mode 100644 roles/etcHosts/defaults/main.yml
diff --git a/roles/OpenVPN-Server/meta/main.yml b/roles/OpenVPN-Server/meta/main.yml
index b5248e1..46f5a23 100644
--- a/roles/OpenVPN-Server/meta/main.yml
+++ b/roles/OpenVPN-Server/meta/main.yml
@@ -1,4 +1,3 @@
---
dependencies:
- - { role: easy-rsa-CA }
- { role: easy-rsa-certificate, x509_csr_args: "--server" }
diff --git a/roles/easy-rsa-certificate/tasks/buildCert.yml b/roles/easy-rsa-certificate/tasks/buildCert.yml
index c529998..db53d46 100644
--- a/roles/easy-rsa-certificate/tasks/buildCert.yml
+++ b/roles/easy-rsa-certificate/tasks/buildCert.yml
@@ -47,8 +47,6 @@
- name: "Creating CSR"
shell: " cd /etc/easy-rsa/2.0; . ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA\"/pkitool --csr {{ x509_csr_args }} {{ x509_common_name }}"
-# args:
-# creates: "/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.key"
when: needcert
sudo: true
@@ -64,23 +62,14 @@
- 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=/tmp/{{ inventory_hostname }}.csr force=yes"
copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.csr dest=/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.csr force=yes"
when: needcert
sudo: true
-#- name: "Place CSR to a right place"
-# local_action: "command cp -f /tmp/{{ inventory_hostname }}.csr /etc/easy-rsa/2.0/keys/{{ x509_common_name }}.csr"
-# when: needcert
-# sudo: true
-
- name: "Sign Certificate"
remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
delegate_to: "{{ x509_ca_server }}"
shell: "cd /etc/easy-rsa/2.0; . ./vars; export EASY_RSA=\"${EASY_RSA:-.}\" ;\"$EASY_RSA\"/pkitool --sign {{ x509_sign_args }} {{ x509_common_name }}"
-# args:
-# chdir: "/etc/easy-rsa/2.0"
-# creates: "/etc/easy-rsa/2.0/keys/{{ x509_common_name }}.crt"
when: needcert
sudo: true
@@ -103,7 +92,6 @@
sudo: true
- name: "Copy the certificate to the node"
-# copy: "src=/tmp/{{ x509_common_name }}.crt dest={{ x509_cert_file }} force=yes"
copy: "src=/tmp/{{ inventory_hostname }}/{{ x509_common_name }}.crt dest=/tmp/{{ x509_common_name }}.crt force=yes"
sudo: true
when: needcert
diff --git a/roles/etcHosts/defaults/main.yml b/roles/etcHosts/defaults/main.yml
deleted file mode 100644
index 1ee9792..0000000
--- a/roles/etcHosts/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-get_groups: true
-edit_hosts: true
diff --git a/roles/etcHosts/tasks/main.yml b/roles/etcHosts/tasks/main.yml
index 1486d48..f527a58 100644
--- a/roles/etcHosts/tasks/main.yml
+++ b/roles/etcHosts/tasks/main.yml
@@ -2,14 +2,12 @@
template: dest=/tmp/groups src=groups.j2
run_once: True
delegate_to: 127.0.0.1
- when: get_groups
- name: make hosts data
command: ./scripts/makehosts.py /tmp/groups {{ domain }}
delegate_to: 127.0.0.1
run_once: True
register: hosts_data
- when: edit_hosts
- name: write hosts file
lineinfile:
@@ -19,4 +17,3 @@
state: present
sudo: true
with_items: hosts_data.stdout_lines
- when: edit_hosts
diff --git a/roles/slurm-build/tasks/main.yml b/roles/slurm-build/tasks/main.yml
index 86a3d6d..4d91dcc 100644
--- a/roles/slurm-build/tasks/main.yml
+++ b/roles/slurm-build/tasks/main.yml
@@ -39,7 +39,6 @@
shell: rpm -i /root/rpmbuild/RPMS/x86_64/munge-libs-{{ munge_version }}-1.el6.x86_64.rpm /root/rpmbuild/RPMS/x86_64/munge-{{ munge_version }}-1.el6.x86_64.rpm /root/rpmbuild/RPMS/x86_64/munge-devel-{{ munge_version }}-1.el6.x86_64.rpm
sudo: true
when: munge_installed.stdout.find("munge") == -1
-# when: munge_installed is failed or munge_installed.stdout.find("munge") == -1
- name: make slurm rpms
shell: rpmbuild -ta --clean slurm-{{ slurm_version }}.tar.bz2
diff --git a/roles/syncExports/templates/exports.j2 b/roles/syncExports/templates/exports.j2
index ca23e57..21c4f55 100644
--- a/roles/syncExports/templates/exports.j2
+++ b/roles/syncExports/templates/exports.j2
@@ -1,6 +1,13 @@
+{% set iplist = [] %}
{% for export in exportList %}
-{{ export.src }} {% for group in groupList %}{% for node in groups[group.name] %} {{ hostvars[node]['ansible_'+group.interface]['ipv4']['address'] }}({{ export.srvopts }})
-{% endfor %}
+{% for group in groupList %}
+{% for node in groups[group.name] %}
+{% if hostvars[node]['ansible_'+group.interface] is defined %}
+{% if iplist.append(hostvars[node]['ansible_'+group.interface]['ipv4']['address']) %}
+{% endif %}
+{% endif %}
{% endfor %}
{% endfor %}
+{{ export.src }} {% for ip in iplist|unique %}{{ ip }}({{ export.srvopts }}) {% endfor %}
+{% endfor %}
--
GitLab