diff --git a/README.md b/README.md
index b7d3df7347326dae8f48f0395dc7844e0220f03e..d5738a8fe0d01cff8d191d950eb71e0e673f09d2 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,5 @@ Here is an example task (taken from setting up karaage):
We aim to make these roles run on all common linux platforms (both RedHat and Debian derived) but at the very least they should work on a CentOS 6 install.
+
+Inventory is not included.
diff --git a/roles/OpenVPN-Client/files/client.conf b/roles/OpenVPN-Client/files/client.conf
index f5756cc7ddf30e4b3438166acdf6bbe6b7bcadd6..3bb3481fea22d005255cad54eddec11d195ee132 100644
--- a/roles/OpenVPN-Client/files/client.conf
+++ b/roles/OpenVPN-Client/files/client.conf
@@ -119,5 +119,7 @@ comp-lzo
# Set log file verbosity.
verb 3
+log openvpn.log
+
# Silence repeating messages
;mute 20
diff --git a/roles/OpenVPN-Client/tasks/copyCerts.yml b/roles/OpenVPN-Client/tasks/copyCerts.yml
index 980d48b2647ca2089cfe3b3d7ede9190139a50f3..d70ec908b6fdd7dc808570aeb165072cc36f1291 100644
--- a/roles/OpenVPN-Client/tasks/copyCerts.yml
+++ b/roles/OpenVPN-Client/tasks/copyCerts.yml
@@ -1,12 +1,12 @@
---
-
- copy: "src={{ ansible_env['PWD'] }}/{{ inventory_hostname }}.cert/ca.crt dest=/etc/openvpn/ca.crt mode=644 owner=root group=root"
+ copy: "src=/tmp/{{ inventory_hostname }}/ca.crt dest=/etc/openvpn/ca.crt mode=644 owner=root group=root"
name: "Copying CA certificate"
-
- copy: "src={{ ansible_env['PWD'] }}/{{ inventory_hostname }}.cert/{{ inventory_hostname }}.crt dest=/etc/openvpn/{{ inventory_hostname }}.crt mode=644 owner=root group=root"
+ copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.crt dest=/etc/openvpn/{{ inventory_hostname }}.crt mode=644 owner=root group=root"
name: "Copying Client certificate"
-
- copy: "src={{ ansible_env['PWD'] }}/{{ inventory_hostname }}.cert/{{ inventory_hostname }}.key dest=/etc/openvpn/{{ inventory_hostname }}.key mode=600 owner=root group=root"
+ copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.key dest=/etc/openvpn/{{ inventory_hostname }}.key mode=600 owner=root group=root"
name: "Copying Client key"
-
copy: "src=client.conf dest=/etc/openvpn/client.conf owner=root group=root mode=644"
@@ -16,11 +16,11 @@
replace: "dest=/etc/openvpn/client.conf regexp=vm-server replace={{ server | mandatory }}"
-
name: "Editing client.conf: Replacing Client Name"
- replace: "dest=/etc/openvpn/client.conf regexp=vm-server replace={{ inventory_hostname }}"
+ replace: "dest=/etc/openvpn/client.conf regexp=vm-dummy replace={{ inventory_hostname }}"
-
name: "Starting openvpn"
service: "name=openvpn enabled=yes state=started"
-
- local_action: "command rm -rf {{ ansible_env['PWD'] }}/{{ inventory_hostname }}.cert"
+ local_action: "command rm -rf /tmp/{{ inventory_hostname }}"
name: "Removing Cert Directory"
diff --git a/roles/easy-rsa-CA-client/defaults/main.yml b/roles/easy-rsa-CA-client/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3e0df58c09e53df21c545b97c1da5cc4d737b935
--- /dev/null
+++ b/roles/easy-rsa-CA-client/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+key_email: shahaan.ayyub@monash.edu
+key_ou: MCC-R@CMON
diff --git a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
index 599e91ccbbf44afa4fde019851c394643ca36286..77d20a6130246aba00904dfd685ded1e85778b76 100644
--- a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
+++ b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
@@ -11,17 +11,14 @@
when: "cert.stat.exists == false"
-
delegate_to: "{{ server }}"
- fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt dest=certDir/ fail_on_missing=yes validate_md5=yes flat=yes"
+ fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt dest=/tmp/{{ inventory_hostname }}/ fail_on_missing=yes validate_md5=yes flat=yes"
name: "Copy the Client Certificate to the master node"
-
delegate_to: "{{ server }}"
- fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key dest=certDir/ fail_on_missing=yes validate_md5=yes flat=yes"
+ fetch: "src=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key dest=/tmp/{{ inventory_hostname }}/ fail_on_missing=yes validate_md5=yes flat=yes"
name: "Copy the Client Certificate to the master node"
-
delegate_to: "{{ server }}"
- fetch: "src=/etc/easy-rsa/2.0/keys/ca.crt dest=certDir/ fail_on_missing=yes validate_md5=yes flat=yes"
+ fetch: "src=/etc/easy-rsa/2.0/keys/ca.crt dest=/tmp/{{ inventory_hostname }}/ fail_on_missing=yes validate_md5=yes flat=yes"
name: "Copy the Client Certificate to the master node"
--
- local_action: "command mv certDir {{ ansible_env['PWD'] }}/{{ inventory_hostname }}.cert"
- name: "Moving certDir"
diff --git a/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml b/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml
index c7c797f7b0ca337aa07742f2270f9093f40931cd..98517f84b97ba8643d171b93df28d39e491f84b2 100644
--- a/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml
+++ b/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml
@@ -8,3 +8,10 @@
- defaultConfig
- paths:
- /mnt/nectar-nfs/root/ansible-config-root/ansible_cluster_in_a_box/roles/easy-rsa-CA/files
+-
+ name: "Editing key_email in config file"
+ replace: dest=/etc/easy-rsa/2.0/vars regexp="shahaan.ayyub@monash.edu" replace={{ key_email }}
+-
+ name: "Editing key_ou in config file"
+ replace: dest=/etc/easy-rsa/2.0/vars regexp="MCC-R@CMON" replace={{ key_ou }}
+
diff --git a/roles/easy-rsa-CA-client/tasks/main.yml b/roles/easy-rsa-CA-client/tasks/main.yml
index 113c15215645b741b6727af4e783ee1fe0beca50..9f6d3148b754be19ae648e571aca356b60d36b8e 100644
--- a/roles/easy-rsa-CA-client/tasks/main.yml
+++ b/roles/easy-rsa-CA-client/tasks/main.yml
@@ -2,6 +2,6 @@
-
include: installEasyRsa.yml
-
- include: copyConfigurationFile.yml
+ include: copyConfigurationFile.yml
-
include: buildClientCert.yml
diff --git a/roles/easy-rsa-CA-server/defaults/main.yml b/roles/easy-rsa-CA-server/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3e0df58c09e53df21c545b97c1da5cc4d737b935
--- /dev/null
+++ b/roles/easy-rsa-CA-server/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+key_email: shahaan.ayyub@monash.edu
+key_ou: MCC-R@CMON
diff --git a/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml b/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml
index c7c797f7b0ca337aa07742f2270f9093f40931cd..51940f2befeaf45bdf80756074675941b46ee180 100644
--- a/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml
+++ b/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml
@@ -8,3 +8,10 @@
- defaultConfig
- paths:
- /mnt/nectar-nfs/root/ansible-config-root/ansible_cluster_in_a_box/roles/easy-rsa-CA/files
+-
+ name: "Editing key_email in config file"
+ replace: dest=/etc/easy-rsa/2.0/vars regexp="shahaan.ayyub@monash.edu" replace={{ key_email }}
+-
+ name: "Editing key_ou in config file"
+ replace: dest=/etc/easy-rsa/2.0/vars regexp="MCC-R@CMON" replace={{ key_ou }}
+
diff --git a/roles/commonVars/vars/main.yml b/roles/etcHosts/defaults/main.yml
similarity index 100%
rename from roles/commonVars/vars/main.yml
rename to roles/etcHosts/defaults/main.yml
diff --git a/roles/resolveHosts/meta/main.yml b/roles/resolveHosts/meta/main.yml
deleted file mode 100644
index 6d22a32f83854bd1cc980aafcf562e1abf7915b7..0000000000000000000000000000000000000000
--- a/roles/resolveHosts/meta/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-dependencies:
- - { role: commonVars }
- - { role: etcHosts }
-
diff --git a/scripts/makehosts.py b/scripts/makehosts.py
index 6068b13ccc69ab1e83f91edce6bf5c1187d12647..b01508bb1b8e5d272a06167111caf5bc9bf5db49 100755
--- a/scripts/makehosts.py
+++ b/scripts/makehosts.py
@@ -19,9 +19,9 @@ for group in d['groups'].keys():
hosts[h] = ['%s.%s'%(h,domain),'%s-%s.%s'%(group,i,domain),'%s'%h,'%s-%s'%(group,i)]
i=i+1
-
for h in hosts.keys():
- string="%s"%(d['hostvars'][h]['ansible_eth0']['ipv4']['address'])
- for name in hosts[h]:
- string=string+" %s"%name
- print string
+ if d['hostvars'].has_key(h):
+ string="%s"%(d['hostvars'][h]['ansible_eth0']['ipv4']['address'])
+ for name in hosts[h]:
+ string=string+" %s"%name
+ print string