Merged conflicting readme.md

readme.md

 # Datalake Local Access Point Setup
--git clone https://git.gsi.de/dc/datalake-reps/ansible_lap.git
--cd ansible_lap
+* git clone https://git.gsi.de/dc/datalake-reps/ansible_lap.git
+* cd ansible_lap
+
 ## Inventory Files
--Creation of YOUR_HOSTS_FILE.inv file from templates/template_hosts.inv
--Creation of dynafedInstances.inv file from templates/template_dynafedInstances.inv
- -replace
-  -your_dynafed_1_hostname
-  -your_dynafed_1_ip
-  -your_dynafed_2_hostname
-  -your_dynafed_2_ip
-  -other_dynafed_2_hostname
-  -other_dynafed_2_ip
-  -your_http_storage_hostname
-  -your_http_storage_ip
+* Creation of YOUR_HOSTS_FILE.inv file from templates/template_hosts.inv
+* Creation of dynafedInstances.inv file from templates/template_dynafedInstances.inv
+  * replace
+    * your_dynafed_1_hostname
+    * your_dynafed_1_ip
+    * your_dynafed_2_hostname
+    * your_dynafed_2_ip
+    * other_dynafed_2_hostname
+    * other_dynafed_2_ip
+    * your_http_storage_hostname
+    * your_http_storage_ip
+
 ## Credentials.yml
--Configure credentials.yml
- -with the running_user_centos you want to run as
-  -root or user with root permissions
-   -create user with root permissions
-    -on centos: adduser USER && passwd USER && usermod -aG wheel USER
-   -put user public key in /home/USER/.ssh/.authorized_keys
-    -mkdir /home/USER/.ssh && vi /home/USER/.ssh/authorized_keys
- -http_proxy (if needed), SET TO none if no proxy needed.
- -dynafed_json: The location of your dynafedInstances.inv
- -Xrootd is only relevant if you want to provision a xrootd dataserver as a http storage
--ansible-playbook playbook.yml -i YOUR_HOSTS_FILE --private-key ~/.ssh/USER_PRIVATE_KEY --ask-become-pass
+* Configure credentials.yml
+  * with the running_user_centos you want to run as
+  * root or user with root permissions
+    * create user with root permissions
+      * on centos: adduser USER && passwd USER && usermod *aG wheel USER
+    * put user public key in /home/USER/.ssh/.authorized_keys
+      * mkdir /home/USER/.ssh && vi /home/USER/.ssh/authorized_keys
+  * http_proxy (if needed), set to none if no proxy needed.
+  * dynafed_json: The location of your dynafedInstances.inv
+  * Xrootd is only relevant if you want to provision an xrootd dataserver as a http storage
+* ansible-playbook playbook.yml -i YOUR_HOSTS_FILE --private-key ~/.ssh/USER_PRIVATE_KEY --ask-become-pass