standardize the roel

playbooks/roles/tanaguru/defaults/main.yml

@@ -16,10 +16,17 @@ tanaguru_download_link: "http://download.tanaguru.org/Tanaguru/tanaguru-3.1.0.i3
 # Default is en-US in our example
 fixfox_esr_link: "http://download-origin.cdn.mozilla.net/pub/firefox/releases/24.0esr/linux-x86_64/en-US/firefox-24.0esr.tar.bz2"
 
+TANAGURU_DATABASE_NAME: 'tgdatabase'
+TANAGURU_DATABASE_USER: 'tguser'
+TANAGURU_DATABASE_PASSWORD: 'tgPassword'
+TANAGURU_URL: 'http://localhost:8080/tanaguru/'
+TANAGURU_ADMIN_EMAIL: 'admin@example.com'
+TANAGURU_ADMIN_PASSWORD: 'tanaguru15'
+
 tanaguru_parameters:
-  tanaguru_database: tgdatabase
-  tanaguru_db_user: tguser
-  tanaguru_db_password: "tgPassword"
-  tanaguru_url: "http://localhost:8080/tanaguru/"
-  tanaguru_admin_email: "admin@example.com"
-  tg_admin_passwd: "tanaguru15"
\ No newline at end of file
+  db_name: "{{ TANAGURU_DATABASE_NAME }}"
+  db_user: "{{ TANAGURU_DATABASE_USER }}"
+  db_password: "{{ TANAGURU_DATABASE_PASSWORD }}"
+  url: "{{ TANAGURU_URL }}"
+  admin_email: "{{ TANAGURU_ADMIN_EMAIL }}"
+  admin_passwd: "{{ TANAGURU_ADMIN_PASSWORD }}"
\ No newline at end of file

playbooks/roles/tanaguru/tasks/main.yml

@@ -122,7 +122,7 @@
 
 - name: Create MySQL database for TanaGuru
   mysql_db: 
-    name: "{{ tanaguru_parameters.tanaguru_database }}"
+    name: "{{ tanaguru_parameters.db_name }}"
     state: present 
     encoding: utf8
     collation: utf8_general_ci
@@ -132,10 +132,10 @@
 
 - name: Create MySQL user for TanaGuru
   mysql_user: 
-    name: "{{ tanaguru_parameters.tanaguru_db_user }}"
-    password: "{{ tanaguru_parameters.tanaguru_db_password }}"
+    name: "{{ tanaguru_parameters.db_user }}"
+    password: "{{ tanaguru_parameters.db_password }}"
     host: localhost  
-    priv: "{{ tanaguru_parameters.tanaguru_database }}.*:ALL"
+    priv: "{{ tanaguru_parameters.db_name }}.*:ALL"
     state: present
   tags:
     - install
@@ -151,14 +151,14 @@
 
 - name: Install the TanaGuru
   shell: >
-    /bin/echo "yes" | ./install.sh --mysql-tg-user "{{ tanaguru_parameters.tanaguru_db_user }}" \
-    --mysql-tg-passwd "{{ tanaguru_parameters.tanaguru_db_password }}" \
-    --mysql-tg-db "{{ tanaguru_parameters.tanaguru_database }}" \
-    --tanaguru-url "{{ tanaguru_parameters.tanaguru_url }}" \
+    /bin/echo "yes" | ./install.sh --mysql-tg-user "{{ tanaguru_parameters.db_user }}" \
+    --mysql-tg-passwd "{{ tanaguru_parameters.db_password }}" \
+    --mysql-tg-db "{{ tanaguru_parameters.db_name }}" \
+    --tanaguru-url "{{ tanaguru_parameters.url }}" \
     --tomcat-webapps /var/lib/tomcat7/webapps \
     --tomcat-user tomcat7 \
-    --tg-admin-email "{{ tanaguru_parameters.tanaguru_admin_email }}" \
-    --tg-admin-passwd "{{ tanaguru_parameters.tg_admin_passwd }}" \
+    --tg-admin-email "{{ tanaguru_parameters.admin_email }}" \
+    --tg-admin-passwd "{{ tanaguru_parameters.admin_passwd }}" \
     --firefox-esr-path /opt/firefox/firefox \
     --display-port ":99.1"
   args: