diff --git a/README.md b/README.md
index b7d3df7347326dae8f48f0395dc7844e0220f03e..df8c0a84b279f979830ad1230ffff2060cd239a6 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,6 @@ 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.
+
+Yaml syntax can be checked at http://www.yamllint.com/
+
diff --git a/roles/OpenVPN-Client/defaults/main.yml b/roles/OpenVPN-Client/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6d22a916d5873c96abec94d19b7a180d7ac7d280
--- /dev/null
+++ b/roles/OpenVPN-Client/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+countryName: "AU" 
+reginalName: "Victoria" 
+cityName: "Melbourne"
+organizationName: "Monash University"
+emailAddress: "default@default.org"
+organizationUnit: "defaultUnit"
+
diff --git a/roles/OpenVPN-Client/handlers/main.yml b/roles/OpenVPN-Client/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f4d46a524e4bead9d9c68d927029967e6b915737
--- /dev/null
+++ b/roles/OpenVPN-Client/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+  - name: restart openvpn
+    service: name=openvpn state=restarted
\ No newline at end of file
diff --git a/roles/OpenVPN-Client/tasks/copyCerts.yml b/roles/OpenVPN-Client/tasks/copyCerts.yml
index 980d48b2647ca2089cfe3b3d7ede9190139a50f3..710f776b5ecb5a982b4e5131bc19aabc627be631 100644
--- a/roles/OpenVPN-Client/tasks/copyCerts.yml
+++ b/roles/OpenVPN-Client/tasks/copyCerts.yml
@@ -1,26 +1,30 @@
 --- 
 - 
-  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"
+  when: "client_ca_cert.stat.exists == false"
 - 
-  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"
+  when: "client_sign_cert.stat.exists == false"
 - 
-  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"
-  name: "Copying client.conf to the OpenVPN client"
-- 
-  name: "Editing client.conf: Replacing Server Name"
-  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 }}"
-- 
-  name: "Starting openvpn"
-  service: "name=openvpn enabled=yes state=started"
-- 
-  local_action: "command rm -rf {{ ansible_env['PWD'] }}/{{ inventory_hostname }}.cert"
-  name: "Removing Cert Directory"
+  when: "client_key.stat.exists == false"
+
+- name: "Copying client.conf to the OpenVPN client"
+  template: src={{ item }} dest=/etc/openvpn/client.conf
+  with_first_found:
+    - files:
+      - client.conf.j2
+      - userConfig
+      - defaultConfig
+      paths:
+        - ../templates/
+        - ../files/
+  notify: restart openvpn
+
+- name: "Removing Cert Directory"
+  local_action: "command rm -rf /tmp/{{ inventory_hostname }}"
+  when: "client_ca_cert.stat.exists == false or client_key.stat.exists == false or client_sign_cert.stat.exists == false"
 
diff --git a/roles/OpenVPN-Client/templates/client.conf.j2 b/roles/OpenVPN-Client/templates/client.conf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..ab437a6687ba19603c723c0340630fb5d6da692a
--- /dev/null
+++ b/roles/OpenVPN-Client/templates/client.conf.j2
@@ -0,0 +1,124 @@
+##############################################
+# Sample client-side OpenVPN 2.0 config file #
+# for connecting to multi-client server.     #
+#                                            #
+# This configuration can be used by multiple #
+# clients, however each client should have   #
+# its own cert and key files.                #
+#                                            #
+# On Windows, you might want to rename this  #
+# file so it has a .ovpn extension           #
+##############################################
+
+# Specify that we are a client and that we
+# will be pulling certain config file directives
+# from the server.
+client
+
+# Use the same setting as you are using on
+# the server.
+# On most systems, the VPN will not function
+# unless you partially or fully disable
+# the firewall for the TUN/TAP interface.
+;dev tap
+dev tun
+
+# Windows needs the TAP-Win32 adapter name
+# from the Network Connections panel
+# if you have more than one.  On XP SP2,
+# you may need to disable the firewall
+# for the TAP adapter.
+;dev-node MyTap
+
+# Are we connecting to a TCP or
+# UDP server?  Use the same setting as
+# on the server.
+proto tcp
+;proto udp
+
+# The hostname/IP and port of the server.
+# You can have multiple remote entries
+# to load balance between the servers.
+remote {{ server }} 1194
+
+# Choose a random host from the remote
+# list for load-balancing.  Otherwise
+# try hosts in the order specified.
+;remote-random
+
+# Keep trying indefinitely to resolve the
+# host name of the OpenVPN server.  Very useful
+# on machines which are not permanently connected
+# to the internet such as laptops.
+resolv-retry infinite
+
+# Most clients don't need to bind to
+# a specific local port number.
+nobind
+
+# Downgrade privileges after initialization (non-Windows only)
+;user nobody
+;group nobody
+
+# Try to preserve some state across restarts.
+persist-key
+persist-tun
+
+# If you are connecting through an
+# HTTP proxy to reach the actual OpenVPN
+# server, put the proxy server/IP and
+# port number here.  See the man page
+# if your proxy server requires
+# authentication.
+;http-proxy-retry # retry on connection failures
+;http-proxy [proxy server] [proxy port #]
+
+# Wireless networks often produce a lot
+# of duplicate packets.  Set this flag
+# to silence duplicate packet warnings.
+;mute-replay-warnings
+
+# SSL/TLS parms.
+# See the server config file for more
+# description.  It's best to use
+# a separate .crt/.key file pair
+# for each client.  A single ca
+# file can be used for all clients.
+ca ca.crt
+cert {{ inventory_hostname }}.crt
+key {{ inventory_hostname }}.key
+
+# Verify server certificate by checking
+# that the certicate has the nsCertType
+# field set to "server".  This is an
+# important precaution to protect against
+# a potential attack discussed here:
+#  http://openvpn.net/howto.html#mitm
+#
+# To use this feature, you will need to generate
+# your server certificates with the nsCertType
+# field set to "server".  The build-key-server
+# script in the easy-rsa folder will do this.
+ns-cert-type server
+
+# If a tls-auth key is used on the server
+# then every client must also have the key.
+;tls-auth ta.key 1
+
+# Select a cryptographic cipher.
+# If the cipher option is used on the server
+# then you must also specify it here.
+cipher BF-CBC
+
+# Enable compression on the VPN link.
+# Don't enable this unless it is also
+# enabled in the server config file.
+comp-lzo
+
+# Set log file verbosity.
+verb 3
+
+log openvpn.log
+
+# Silence repeating messages
+;mute 20
diff --git a/roles/OpenVPN-Server/defaults/main.yml b/roles/OpenVPN-Server/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..85154e01ac9067415beb78d84ecf4dbf7c7e60ff
--- /dev/null
+++ b/roles/OpenVPN-Server/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+countryName: "AU" 
+reginalName: "Victoria" 
+cityName: "Melbourne"
+organizationName: "Monash University"
+emailAddress: "default@default.org"
+organizationUnit: "defaultUnit"
diff --git a/roles/OpenVPN-Server/handlers/main.yml b/roles/OpenVPN-Server/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f4d46a524e4bead9d9c68d927029967e6b915737
--- /dev/null
+++ b/roles/OpenVPN-Server/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+  - name: restart openvpn
+    service: name=openvpn state=restarted
\ No newline at end of file
diff --git a/roles/OpenVPN-Server/tasks/copyCerts.yml b/roles/OpenVPN-Server/tasks/copyCerts.yml
index 13bde606a538ad32fff2c80cd7d24aaa8ca88485..243fae4b19a47abde51879f623bb73d80fe1b466 100644
--- a/roles/OpenVPN-Server/tasks/copyCerts.yml
+++ b/roles/OpenVPN-Server/tasks/copyCerts.yml
@@ -1,41 +1,19 @@
 --- 
-- 
-  failed_when: "CAcert.stat.exists  == false"
-  name: "Checking if CA certificate exist"
-  register: CAcert
-  stat: path="/etc/easy-rsa/2.0/keys/ca.crt"
-- 
-  name: "Copying CA certificate"
-  shell: "cp -rpvf /etc/easy-rsa/2.0/keys/ca.crt /etc/openvpn/"
-  when: "CAcert.stat.exists  == true"
-- 
-  failed_when: "ServerCert.stat.exists  == false"
-  name: "Check if Server certificate exist"
-  register: ServerCert
-  stat: "path=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt"
-- 
-  name: "Copying Server certificate"
-  shell: "cp -rpvf /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt /etc/openvpn/"
-  when: "ServerCert.stat.exists  == true"
-- 
-  failed_when: "ServerKey.stat.exists  == false"
-  name: "Check if Server key exist"
-  register: ServerKey
-  stat: "path=/etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key"
-- 
-  name: "Copying Server key"
-  shell: "cp -rpvf /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key /etc/openvpn/"
-  when: "ServerKey.stat.exists  == true"
-- 
+- name: "Copying CA and server certificate"
+  shell: "cp -pvf /etc/easy-rsa/2.0/keys/ca.crt /etc/openvpn/; cp -pvf /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt /etc/openvpn/; cp -pvf /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key /etc/openvpn/"
+  args:
+    creates: /etc/openvpn/ca.crt
+- name: "Create symlink for Diffie Hellman"
   file: "src=/etc/easy-rsa/2.0/keys/dh512.pem dest=/etc/openvpn/dh512.pem state=link"
-  name: "Create symlink for Diffie Hellman"
-- 
-  copy: "src=server.conf dest=/etc/openvpn/server.conf owner=root group=root mode=644"
-  name: "Copying server.conf to the OpenVPN server"
-- 
-  name: "Editing server.conf"
-  replace: "dest=/etc/openvpn/server.conf regexp=vm-server replace={{ inventory_hostname }}"
-- 
-  name: "Starting openvpn"
-  service: "name=openvpn enabled=yes state=started"
+- name: "Copying server.conf to the OpenVPN server"
+  template: src={{ item }} dest=/etc/openvpn/server.conf
+  with_first_found:
+    - files:
+        - server.conf.j2
+        - userConfig
+        - defaultConfig
+      paths:
+        - ../templates/
+        - ../files/
+  notify: restart openvpn
 
diff --git a/roles/OpenVPN-Server/templates/server.conf.j2 b/roles/OpenVPN-Server/templates/server.conf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..f191cb4571d09f01912c74943598a4c3cf3779a1
--- /dev/null
+++ b/roles/OpenVPN-Server/templates/server.conf.j2
@@ -0,0 +1,299 @@
+#################################################
+# Sample OpenVPN 2.0 config file for            #
+# multi-client server.                          #
+#                                               #
+# This file is for the server side              #
+# of a many-clients <-> one-server              #
+# OpenVPN configuration.                        #
+#                                               #
+# OpenVPN also supports                         #
+# single-machine <-> single-machine             #
+# configurations (See the Examples page         #
+# on the web site for more info).               #
+#                                               #
+# This config should work on Windows            #
+# or Linux/BSD systems.  Remember on            #
+# Windows to quote pathnames and use            #
+# double backslashes, e.g.:                     #
+# "C:\\Program Files\\OpenVPN\\config\\foo.key" #
+#                                               #
+# Comments are preceded with '#' or ';'         #
+#################################################
+
+# Which local IP address should OpenVPN
+# listen on? (optional)
+local {{ inventory_hostname }} 
+
+# Which TCP/UDP port should OpenVPN listen on?
+# If you want to run multiple OpenVPN instances
+# on the same machine, use a different port
+# number for each one.  You will need to
+# open up this port on your firewall.
+port 1194
+
+# TCP or UDP server?
+proto tcp
+;proto udp
+
+# "dev tun" will create a routed IP tunnel,
+# "dev tap" will create an ethernet tunnel.
+# Use "dev tap0" if you are ethernet bridging
+# and have precreated a tap0 virtual interface
+# and bridged it with your ethernet interface.
+# If you want to control access policies
+# over the VPN, you must create firewall
+# rules for the the TUN/TAP interface.
+# On non-Windows systems, you can give
+# an explicit unit number, such as tun0.
+# On Windows, use "dev-node" for this.
+# On most systems, the VPN will not function
+# unless you partially or fully disable
+# the firewall for the TUN/TAP interface.
+;dev tap
+dev tun
+
+# Windows needs the TAP-Win32 adapter name
+# from the Network Connections panel if you
+# have more than one.  On XP SP2 or higher,
+# you may need to selectively disable the
+# Windows firewall for the TAP adapter.
+# Non-Windows systems usually don't need this.
+;dev-node MyTap
+
+# SSL/TLS root certificate (ca), certificate
+# (cert), and private key (key).  Each client
+# and the server must have their own cert and
+# key file.  The server and all clients will
+# use the same ca file.
+#
+# See the "easy-rsa" directory for a series
+# of scripts for generating RSA certificates
+# and private keys.  Remember to use
+# a unique Common Name for the server
+# and each of the client certificates.
+#
+# Any X509 key management system can be used.
+# OpenVPN can also use a PKCS #12 formatted key file
+# (see "pkcs12" directive in man page).
+ca ca.crt
+cert {{ inventory_hostname }}.crt
+key {{ inventory_hostname }}.key  
+
+# Diffie hellman parameters.
+# Generate your own with:
+#   openssl dhparam -out dh1024.pem 1024
+# Substitute 2048 for 1024 if you are using
+# 2048 bit keys. 
+dh dh512.pem
+
+# Configure server mode and supply a VPN subnet
+# for OpenVPN to draw client addresses from.
+# The server will take 10.8.0.1 for itself,
+# the rest will be made available to clients.
+# Each client will be able to reach the server
+# on 10.8.0.1. Comment this line out if you are
+# ethernet bridging. See the man page for more info.
+server 10.8.0.0 255.255.255.0
+
+# Maintain a record of client <-> virtual IP address
+# associations in this file.  If OpenVPN goes down or
+# is restarted, reconnecting clients can be assigned
+# the same virtual IP address from the pool that was
+# previously assigned.
+ifconfig-pool-persist ipp.txt
+
+# Configure server mode for ethernet bridging.
+# You must first use your OS's bridging capability
+# to bridge the TAP interface with the ethernet
+# NIC interface.  Then you must manually set the
+# IP/netmask on the bridge interface, here we
+# assume 10.8.0.4/255.255.255.0.  Finally we
+# must set aside an IP range in this subnet
+# (start=10.8.0.50 end=10.8.0.100) to allocate
+# to connecting clients.  Leave this line commented
+# out unless you are ethernet bridging.
+;server-bridge 10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100
+
+# Configure server mode for ethernet bridging
+# using a DHCP-proxy, where clients talk
+# to the OpenVPN server-side DHCP server
+# to receive their IP address allocation
+# and DNS server addresses.  You must first use
+# your OS's bridging capability to bridge the TAP
+# interface with the ethernet NIC interface.
+# Note: this mode only works on clients (such as
+# Windows), where the client-side TAP adapter is
+# bound to a DHCP client.
+;server-bridge
+
+# Push routes to the client to allow it
+# to reach other private subnets behind
+# the server.  Remember that these
+# private subnets will also need
+# to know to route the OpenVPN client
+# address pool (10.8.0.0/255.255.255.0)
+# back to the OpenVPN server.
+;push "route 192.168.10.0 255.255.255.0"
+;push "route 192.168.20.0 255.255.255.0"
+
+# To assign specific IP addresses to specific
+# clients or if a connecting client has a private
+# subnet behind it that should also have VPN access,
+# use the subdirectory "ccd" for client-specific
+# configuration files (see man page for more info).
+
+# EXAMPLE: Suppose the client
+# having the certificate common name "Thelonious"
+# also has a small subnet behind his connecting
+# machine, such as 192.168.40.128/255.255.255.248.
+# First, uncomment out these lines:
+;client-config-dir ccd
+;route 192.168.40.128 255.255.255.248
+# Then create a file ccd/Thelonious with this line:
+#   iroute 192.168.40.128 255.255.255.248
+# This will allow Thelonious' private subnet to
+# access the VPN.  This example will only work
+# if you are routing, not bridging, i.e. you are
+# using "dev tun" and "server" directives.
+
+# EXAMPLE: Suppose you want to give
+# Thelonious a fixed VPN IP address of 10.9.0.1.
+# First uncomment out these lines:
+;client-config-dir ccd
+;route 10.9.0.0 255.255.255.252
+# Then add this line to ccd/Thelonious:
+#   ifconfig-push 10.9.0.1 10.9.0.2
+
+# Suppose that you want to enable different
+# firewall access policies for different groups
+# of clients.  There are two methods:
+# (1) Run multiple OpenVPN daemons, one for each
+#     group, and firewall the TUN/TAP interface
+#     for each group/daemon appropriately.
+# (2) (Advanced) Create a script to dynamically
+#     modify the firewall in response to access
+#     from different clients.  See man
+#     page for more info on learn-address script.
+;learn-address ./script
+
+# If enabled, this directive will configure
+# all clients to redirect their default
+# network gateway through the VPN, causing
+# all IP traffic such as web browsing and
+# and DNS lookups to go through the VPN
+# (The OpenVPN server machine may need to NAT
+# or bridge the TUN/TAP interface to the internet
+# in order for this to work properly).
+;push "redirect-gateway def1 bypass-dhcp"
+
+# Certain Windows-specific network settings
+# can be pushed to clients, such as DNS
+# or WINS server addresses.  CAVEAT:
+# http://openvpn.net/faq.html#dhcpcaveats
+# The addresses below refer to the public
+# DNS servers provided by opendns.com.
+;push "dhcp-option DNS 208.67.222.222"
+;push "dhcp-option DNS 208.67.220.220"
+
+# Uncomment this directive to allow different
+# clients to be able to "see" each other.
+# By default, clients will only see the server.
+# To force clients to only see the server, you
+# will also need to appropriately firewall the
+# server's TUN/TAP interface.
+;client-to-client
+
+# Uncomment this directive if multiple clients
+# might connect with the same certificate/key
+# files or common names.  This is recommended
+# only for testing purposes.  For production use,
+# each client should have its own certificate/key
+# pair.
+#
+# IF YOU HAVE NOT GENERATED INDIVIDUAL
+# CERTIFICATE/KEY PAIRS FOR EACH CLIENT,
+# EACH HAVING ITS OWN UNIQUE "COMMON NAME",
+# UNCOMMENT THIS LINE OUT.
+;duplicate-cn
+
+# The keepalive directive causes ping-like
+# messages to be sent back and forth over
+# the link so that each side knows when
+# the other side has gone down.
+# Ping every 10 seconds, assume that remote
+# peer is down if no ping received during
+# a 120 second time period.
+keepalive 10 120
+
+# For extra security beyond that provided
+# by SSL/TLS, create an "HMAC firewall"
+# to help block DoS attacks and UDP port flooding.
+#
+# Generate with:
+#   openvpn --genkey --secret ta.key
+#
+# The server and each client must have
+# a copy of this key.
+# The second parameter should be '0'
+# on the server and '1' on the clients.
+;tls-auth ta.key 0 # This file is secret
+
+# Select a cryptographic cipher.
+# This config item must be copied to
+# the client config file as well.
+cipher BF-CBC        # Blowfish (default)
+;cipher AES-128-CBC   # AES
+;cipher DES-EDE3-CBC  # Triple-DES
+
+# Enable compression on the VPN link.
+# If you enable it here, you must also
+# enable it in the client config file.
+comp-lzo
+
+# The maximum number of concurrently connected
+# clients we want to allow.
+max-clients 100
+
+# It's a good idea to reduce the OpenVPN
+# daemon's privileges after initialization.
+#
+# You can uncomment this out on
+# non-Windows systems.
+;user nobody
+;group nobody
+
+# The persist options will try to avoid
+# accessing certain resources on restart
+# that may no longer be accessible because
+# of the privilege downgrade.
+persist-key
+persist-tun
+
+# Output a short status file showing
+# current connections, truncated
+# and rewritten every minute.
+status openvpn-status.log
+
+# By default, log messages will go to the syslog (or
+# on Windows, if running as a service, they will go to
+# the "\Program Files\OpenVPN\log" directory).
+# Use log or log-append to override this default.
+# "log" will truncate the log file on OpenVPN startup,
+# while "log-append" will append to it.  Use one
+# or the other (but not both).
+log         openvpn.log
+;log-append  openvpn.log
+
+# Set the appropriate level of log
+# file verbosity.
+#
+# 0 is silent, except for fatal errors
+# 4 is reasonable for general usage
+# 5 and 6 can help to debug connection problems
+# 9 is extremely verbose
+verb 3
+
+# Silence repeating messages.  At most 20
+# sequential messages of the same message
+# category will be output to the log.
+;mute 20
diff --git a/roles/easy-rsa-CA-client/meta/main.yml b/roles/easy-rsa-CA-client/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..47d82924b50117d9d5b167e74845abc912ac292e
--- /dev/null
+++ b/roles/easy-rsa-CA-client/meta/main.yml
@@ -0,0 +1,4 @@
+---
+depdenencies:
+  - {role: easy-rsa-common }
+
diff --git a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml b/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
deleted file mode 100644
index 7525599eef81727423c123026334eb0a3caa45b9..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA-client/tasks/buildClientCert.yml
+++ /dev/null
@@ -1,23 +0,0 @@
---- 
-- 
-  delegate_to: "{{ server }}"
-  name: "Creating Client certificate"
-  shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA\"/pkitool --csr {{ inventory_hostname }} ;\"$EASY_RSA\"/pkitool --sign {{ inventory_hostname }}"
-  args:
-   creates: /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt
-- 
-  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"
-  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"
-  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"
-  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
deleted file mode 100644
index c7c797f7b0ca337aa07742f2270f9093f40931cd..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA-client/tasks/copyConfigurationFile.yml
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-- 
-  copy: "src={{ item }} dest=/etc/easy-rsa/2.0/vars mode=0644 owner=root"
-  name: "Copy the configuration file (userConfig): else defaultConfig"
-  with_first_found: 
-    - files:
-      - userConfig
-      - defaultConfig
-    - paths:
-      - /mnt/nectar-nfs/root/ansible-config-root/ansible_cluster_in_a_box/roles/easy-rsa-CA/files
diff --git a/roles/easy-rsa-CA-client/tasks/installEasyRsa.yml b/roles/easy-rsa-CA-client/tasks/installEasyRsa.yml
deleted file mode 100644
index c588091169a19f9b07b6d9b1cc7d5c282f97354a..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA-client/tasks/installEasyRsa.yml
+++ /dev/null
@@ -1,7 +0,0 @@
---- 
-- 
-  name: "Installing easy-rsa"
-  yum: "name=easy-rsa state=latest"
-- 
-  name: "Moving easy-rsa to /etc"
-  shell: "cp -rf /usr/share/easy-rsa /etc/"
diff --git a/roles/easy-rsa-CA-server/files/defaultConfig b/roles/easy-rsa-CA-server/files/defaultConfig
deleted file mode 100644
index af221dfed32653da382c10dc08b52999a9cd245e..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA-server/files/defaultConfig
+++ /dev/null
@@ -1,80 +0,0 @@
-# easy-rsa parameter settings
-
-# NOTE: If you installed from an RPM,
-# don't edit this file in place in
-# /usr/share/openvpn/easy-rsa --
-# instead, you should copy the whole
-# easy-rsa directory to another location
-# (such as /etc/openvpn) so that your
-# edits will not be wiped out by a future
-# OpenVPN package upgrade.
-
-# This variable should point to
-# the top level of the easy-rsa
-# tree.
-export EASY_RSA="/etc/easy-rsa/2.0"
-
-#
-# This variable should point to
-# the requested executables
-#
-export OPENSSL="openssl"
-export PKCS11TOOL="pkcs11-tool"
-export GREP="grep"
-
-
-# This variable should point to
-# the openssl.cnf file included
-# with easy-rsa.
-export KEY_CONFIG=`$EASY_RSA/whichopensslcnf $EASY_RSA`
-
-# Edit this variable to point to
-# your soon-to-be-created key
-# directory.
-#
-# WARNING: clean-all will do
-# a rm -rf on this directory
-# so make sure you define
-# it correctly!
-export KEY_DIR="$EASY_RSA/keys"
-
-# Issue rm -rf warning
-echo NOTE: If you run ./clean-all, I will be doing a rm -rf on $KEY_DIR
-
-# PKCS11 fixes
-export PKCS11_MODULE_PATH="dummy"
-export PKCS11_PIN="dummy"
-
-# Increase this to 2048 if you
-# are paranoid.  This will slow
-# down TLS negotiation performance
-# as well as the one-time DH parms
-# generation process.
-export KEY_SIZE=512
-
-# In how many days should the root CA key expire?
-export CA_EXPIRE=3650
-
-# In how many days should certificates expire?
-export KEY_EXPIRE=3650
-
-# These are the default values for fields
-# which will be placed in the certificate.
-# Don't leave any of these fields blank.
-export KEY_COUNTRY="AU"
-export KEY_PROVINCE="Victoria"
-export KEY_CITY="Melbourne"
-export KEY_ORG="Monash University"
-export KEY_EMAIL="shahaan.ayyub@monash.edu"
-export KEY_OU="MCC-R@CMON"
-
-# X509 Subject Field
-export KEY_NAME="EasyRSA"
-
-# PKCS11 Smart Card
-# export PKCS11_MODULE_PATH="/usr/lib/changeme.so"
-# export PKCS11_PIN=1234
-
-# If you'd like to sign all keys with the same Common Name, uncomment the KEY_CN export below
-# You will also need to make sure your OpenVPN server config has the duplicate-cn option set
-# export KEY_CN="CommonName"
diff --git a/roles/easy-rsa-CA-server/meta/main.yml b/roles/easy-rsa-CA-server/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..47d82924b50117d9d5b167e74845abc912ac292e
--- /dev/null
+++ b/roles/easy-rsa-CA-server/meta/main.yml
@@ -0,0 +1,4 @@
+---
+depdenencies:
+  - {role: easy-rsa-common }
+
diff --git a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml b/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
deleted file mode 100644
index 7de1e2229d8f0b56aa3216c6f13533b1a01d14c3..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA-server/tasks/buildServerCert.yml
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-- 
-  args: 
-    creates: "/etc/easy-rsa/2.0/keys/{{ ansible_fqdn }}.crt"
-  name: "Creating Server certificate"
-  shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA/pkitool\"  --server {{ ansible_fqdn }}"
-- 
-  args: 
-    creates: /etc/easy-rsa/2.0/keys/dh512.pem
-  name: "Generating Diffie-Hellman Parameters"
-  shell: "cd /etc/easy-rsa/2.0; source ./vars; ./build-dh"
diff --git a/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml b/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml
deleted file mode 100644
index c7c797f7b0ca337aa07742f2270f9093f40931cd..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA-server/tasks/copyConfigurationFile.yml
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-- 
-  copy: "src={{ item }} dest=/etc/easy-rsa/2.0/vars mode=0644 owner=root"
-  name: "Copy the configuration file (userConfig): else defaultConfig"
-  with_first_found: 
-    - files:
-      - userConfig
-      - defaultConfig
-    - paths:
-      - /mnt/nectar-nfs/root/ansible-config-root/ansible_cluster_in_a_box/roles/easy-rsa-CA/files
diff --git a/roles/easy-rsa-CA-server/tasks/installEasyRsa.yml b/roles/easy-rsa-CA-server/tasks/installEasyRsa.yml
deleted file mode 100644
index c588091169a19f9b07b6d9b1cc7d5c282f97354a..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA-server/tasks/installEasyRsa.yml
+++ /dev/null
@@ -1,7 +0,0 @@
---- 
-- 
-  name: "Installing easy-rsa"
-  yum: "name=easy-rsa state=latest"
-- 
-  name: "Moving easy-rsa to /etc"
-  shell: "cp -rf /usr/share/easy-rsa /etc/"
diff --git a/roles/easy-rsa-CA-server/tasks/main.yml b/roles/easy-rsa-CA-server/tasks/main.yml
index c9de117ea520083afe7d18aefa912156a5331c67..69333644c40726ecf03556abf311c22838f1116a 100644
--- a/roles/easy-rsa-CA-server/tasks/main.yml
+++ b/roles/easy-rsa-CA-server/tasks/main.yml
@@ -1,7 +1,3 @@
 --- 
-- 
-  include: installEasyRsa.yml
-- 
-  include: copyConfigurationFile.yml
 - 
   include: buildServerCert.yml
diff --git a/roles/easy-rsa-CA/meta/main.yml b/roles/easy-rsa-CA/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..47d82924b50117d9d5b167e74845abc912ac292e
--- /dev/null
+++ b/roles/easy-rsa-CA/meta/main.yml
@@ -0,0 +1,4 @@
+---
+depdenencies:
+  - {role: easy-rsa-common }
+
diff --git a/roles/easy-rsa-CA/tasks/buildCA.yml b/roles/easy-rsa-CA/tasks/buildCA.yml
index 4c6fe213e0e1c4227d4f5195f905b1a2d896b079..f6624664d58df6670e926d5dad261f0e7f28e72b 100644
--- a/roles/easy-rsa-CA/tasks/buildCA.yml
+++ b/roles/easy-rsa-CA/tasks/buildCA.yml
@@ -2,3 +2,5 @@
 - 
   name: "Building the CA Certificate"
   shell: ' cd /etc/easy-rsa/2.0; source ./vars; ./clean-all;  export EASY_RSA="${EASY_RSA:-.}"; "$EASY_RSA/pkitool" --initca $*'
+  args:
+    creates: /etc/easy-rsa/2.0/keys
diff --git a/roles/easy-rsa-CA/tasks/buildClientCert.yml b/roles/easy-rsa-CA/tasks/buildClientCert.yml
deleted file mode 100644
index 24aed52c77f989416e44b7ce8517e74c08be172d..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA/tasks/buildClientCert.yml
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-- 
-  delegate_to: "127.0.0.1"
-  name: "Check if certificate exist"
-  register: cert
-  stat: "path=/etc/easy-rsa/2.0/keys/{{ client }}.crt"
-- 
-  delegate_to: "127.0.0.1"
-  name: "Creating Client certificate"
-  shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\\\"${EASY_RSA:-.}\\\"; \"$EASY_RSA/pkitool\" --csr {{ client }} ;\"$E ASY_RSA/pkitool\" --sign {{ client }}"
-
diff --git a/roles/easy-rsa-CA/tasks/buildServerCert.yml b/roles/easy-rsa-CA/tasks/buildServerCert.yml
deleted file mode 100644
index 9f7c8aea3b7c19732301f3569bfb32fc6dadfd91..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA/tasks/buildServerCert.yml
+++ /dev/null
@@ -1,17 +0,0 @@
---- 
-- 
-  name: "Check if certificate exist"
-  register: cert
-  stat: "path=/etc/easy-rsa/2.0/keys/{{ server }}.crt"
-- 
-  name: "Creating Server certificate"
-  shell: " cd /etc/easy-rsa/2.0; source ./vars; export EASY_RSA=\"${EASY_RSA:-.}\"; \"$EASY_RSA/pkitool\"  --server {{ server }}"
-  when: "cert.stat.exists == false"
-- 
-  name: "Check if Diffie Hellman parameters file exist"
-  register: dh
-  stat: path=/etc/easy-rsa/2.0/keys/dh512.pem
-- 
-  name: "Generating Diffie-Hellman Parameters"
-  shell: "cd /etc/easy-rsa/2.0; source ./vars; ./build-dh"
-  when: "dh.stat.exists == false"
diff --git a/roles/easy-rsa-CA/tasks/copyConfigurationFile.yml b/roles/easy-rsa-CA/tasks/copyConfigurationFile.yml
deleted file mode 100644
index c7c797f7b0ca337aa07742f2270f9093f40931cd..0000000000000000000000000000000000000000
--- a/roles/easy-rsa-CA/tasks/copyConfigurationFile.yml
+++ /dev/null
@@ -1,10 +0,0 @@
---- 
-- 
-  copy: "src={{ item }} dest=/etc/easy-rsa/2.0/vars mode=0644 owner=root"
-  name: "Copy the configuration file (userConfig): else defaultConfig"
-  with_first_found: 
-    - files:
-      - userConfig
-      - defaultConfig
-    - paths:
-      - /mnt/nectar-nfs/root/ansible-config-root/ansible_cluster_in_a_box/roles/easy-rsa-CA/files
diff --git a/roles/easy-rsa-CA/tasks/main.yml b/roles/easy-rsa-CA/tasks/main.yml
index 947bff3c83fe9e9816e252d99f4dc89d369dd8fd..50dfbfafef0e4d7682081b1d87dd552bde088006 100644
--- a/roles/easy-rsa-CA/tasks/main.yml
+++ b/roles/easy-rsa-CA/tasks/main.yml
@@ -1,7 +1,3 @@
 --- 
--
-  include: installEasyRsa.yml
--
-  include: copyConfigurationFile.yml
 - 
   include: buildCA.yml
diff --git a/roles/easy-rsa-common/defaults/main.yml b/roles/easy-rsa-common/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6d22a916d5873c96abec94d19b7a180d7ac7d280
--- /dev/null
+++ b/roles/easy-rsa-common/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+countryName: "AU" 
+reginalName: "Victoria" 
+cityName: "Melbourne"
+organizationName: "Monash University"
+emailAddress: "default@default.org"
+organizationUnit: "defaultUnit"
+
diff --git a/roles/easy-rsa-CA-client/files/defaultConfig b/roles/easy-rsa-common/files/defaultConfig
similarity index 100%
rename from roles/easy-rsa-CA-client/files/defaultConfig
rename to roles/easy-rsa-common/files/defaultConfig
diff --git a/roles/easy-rsa-common/tasks/copyConfigurationFile.yml b/roles/easy-rsa-common/tasks/copyConfigurationFile.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0bd44099d8380443f30698d35f164c5dcf5b85f1
--- /dev/null
+++ b/roles/easy-rsa-common/tasks/copyConfigurationFile.yml
@@ -0,0 +1,12 @@
+--- 
+- name: "Copy the configuration file"
+  template: src={{ item }} dest=/etc/easy-rsa/2.0/vars mode=0644 owner=root
+  with_first_found:
+    - files:
+        - vars.j2
+        - userConfig
+        - defaultConfig
+      paths:
+        - ../../../templates/easy-rsa/
+        - ../files/
+
diff --git a/roles/easy-rsa-CA/tasks/installEasyRsa.yml b/roles/easy-rsa-common/tasks/installEasyRsa.yml
similarity index 81%
rename from roles/easy-rsa-CA/tasks/installEasyRsa.yml
rename to roles/easy-rsa-common/tasks/installEasyRsa.yml
index c588091169a19f9b07b6d9b1cc7d5c282f97354a..80d80a19dd03c8959774dd0a7d94d4a1ac4d7004 100644
--- a/roles/easy-rsa-CA/tasks/installEasyRsa.yml
+++ b/roles/easy-rsa-common/tasks/installEasyRsa.yml
@@ -5,3 +5,5 @@
 - 
   name: "Moving easy-rsa to /etc"
   shell: "cp -rf /usr/share/easy-rsa /etc/"
+  args:
+    creates: /etc/easy-rsa
diff --git a/roles/easy-rsa-common/tasks/main.yml b/roles/easy-rsa-common/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fe7a5a8364fe069237300d51e50cd5e3a52844e8
--- /dev/null
+++ b/roles/easy-rsa-common/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+-
+  include: installEasyRsa.yml
+-
+  include: copyConfigurationFile.yml
+
diff --git a/roles/etcHosts/defaults/main.yml b/roles/etcHosts/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c85dccd9b9bf2e97a679142e46fd5cf218b9f9be
--- /dev/null
+++ b/roles/etcHosts/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+domain: testdomain.massive.org.au
+get_groups: true
+edit_hosts: true
diff --git a/roles/etcHosts/tasks/main.yml b/roles/etcHosts/tasks/main.yml
index f527a58950bcd0543c321856255738f734096518..ce9aacc257a048c485966f65cbbd5fd783c35143 100644
--- a/roles/etcHosts/tasks/main.yml
+++ b/roles/etcHosts/tasks/main.yml
@@ -2,12 +2,14 @@
   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:
@@ -17,3 +19,5 @@
     state: present
   sudo: true
   with_items: hosts_data.stdout_lines
+  when: edit_hosts
+
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
diff --git a/roles/easy-rsa-CA/files/defaultConfig b/templates/easy-rsa/vars.j2
similarity index 89%
rename from roles/easy-rsa-CA/files/defaultConfig
rename to templates/easy-rsa/vars.j2
index af221dfed32653da382c10dc08b52999a9cd245e..52d7a3e5008aceda213cedc17b413bfd955ba444 100644
--- a/roles/easy-rsa-CA/files/defaultConfig
+++ b/templates/easy-rsa/vars.j2
@@ -61,12 +61,12 @@ export KEY_EXPIRE=3650
 # These are the default values for fields
 # which will be placed in the certificate.
 # Don't leave any of these fields blank.
-export KEY_COUNTRY="AU"
-export KEY_PROVINCE="Victoria"
-export KEY_CITY="Melbourne"
-export KEY_ORG="Monash University"
-export KEY_EMAIL="shahaan.ayyub@monash.edu"
-export KEY_OU="MCC-R@CMON"
+export KEY_COUNTRY={{ countryName }}
+export KEY_PROVINCE={{ reginalName }} 
+export KEY_CITY={{ cityName }} 
+export KEY_ORG={{ organizationName }} 
+export KEY_EMAIL={{ emailAddress }} 
+export KEY_OU={{ organizationUnit }}
 
 # X509 Subject Field
 export KEY_NAME="EasyRSA"