Merge pull request #5 from CVL-GitHub/master

Request to merge 

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.

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

roles/OpenVPN-Client/tasks/copyCerts.yml

 --- 
 - 
-  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"
 

roles/easy-rsa-CA-client/defaults/main.yml

+---
+key_email: shahaan.ayyub@monash.edu 
+key_ou: MCC-R@CMON

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"
 

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 }}
+

roles/easy-rsa-CA-client/tasks/main.yml

@@ -2,6 +2,6 @@
 -
   include: installEasyRsa.yml
 -
-  include: copyConfigurationFile.yml
+  include: copyConfigurationFile.yml 
 - 
   include: buildClientCert.yml

roles/easy-rsa-CA-server/defaults/main.yml

+---
+key_email: shahaan.ayyub@monash.edu 
+key_ou: MCC-R@CMON

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 }}
+

roles/resolveHosts/meta/main.yml

----
-dependencies:
-  - { role: commonVars }
-  - { role: etcHosts }
-

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