implementing uc var convention

playbooks/roles/analytics-server/defaults/main.yml

@@ -12,16 +12,20 @@
 # vars are namespace with the module name.
 #
 
-AS_DB_ANALYTICS_PASSWORD: ''
-AS_DB_ANALYTICS_USER: ''
-AS_DB_ANALYTICS_HOST: ''
+AS_DB_ANALYTICS_PASSWORD: 'CHANGEME!'
+AS_DB_ANALYTICS_USER: 'analytics001'
+AS_DB_ANALYTICS_HOST: 'localhost'
+AS_SERVER_PORT: '9000'
+AS_ENV_LANG: 'en_US.UTF-8'
+AS_LOG_LEVEL: 'INFO'
+AS_WORKERS: '4'
 
 DATABASES:
   default: &databases_default
     ENGINE: 'django.db.backends.mysql'
     NAME: 'wwc'
-    USER: 'edxapp001'
-    PASSWORD: 'CHANGEME'
+    USER: 'analytics001'
+    PASSWORD: 'CHANGEME!'
     HOST: 'CHANGEME'
     PORT: 3306
 
@@ -47,18 +51,14 @@ as_code_dir: "{{ as_home }}/src"
 as_version: "master"
 as_git_identity_path: "{{ secure_dir }}/files/git-identity"
 as_requirements_file: "{{ as_code_dir }}/requirements.txt"
-as_log_level: "INFO"
 as_rsyslog_enabled: "yes"
 as_web_user: "www-data"
 as_env: "analytics-server_env"
 as_service_variant: 'analytics'
-as_workers: '4'
-as_server_port: '9000'
-as_env_lang: 'en_US.UTF-8'
 as_django_settings: 'anserv.settings'
 
 as_env_vars:
-  ANALYTICS_SERVER_LOG_LEVEL: "{{ as_log_level }}"
+  ANALYTICS_SERVER_LOG_LEVEL: "{{ AS_LOG_LEVEL }}"
   
 as_automated_rbash_links:
   - /usr/bin/sudo
@@ -75,5 +75,8 @@ as_debian_pkgs:
 
 as_redhat_pkgs: []
 
+#
+# Installed via pip to get the IAM role feature.
+#
 as_pip_pkgs:
   - git+https://github.com/s3tools/s3cmd.git#egg=s3cmd
\ No newline at end of file

playbooks/roles/analytics-server/templates/etc/init/analytics.conf.j2

@@ -10,9 +10,9 @@ respawn limit 3 30
 
 env SERVICE_VARIANT={{ as_service_variant }}
 env PID=/var/tmp/analytics.pid
-env WORKERS={{ as_workers }}
-env PORT={{ as_server_port }}
-env LANG={{ as_env_lang }}
+env WORKERS={{ AS_WORKERS }}
+env PORT={{ AS_SERVER_PORT }}
+env LANG={{ AS_ENV_LANG }}
 env DJANGO_SETTINGS_MODULE={{ as_django_settings }}
 
 chdir {{ as_code_dir }}