Changing variable to COMMON

playbooks/edx-east/edx_provision.yml

@@ -57,7 +57,6 @@
     - roles/xqueue/defaults/main.yml
     - roles/xserver/defaults/main.yml
     - roles/forum/defaults/main.yml
-    - roles/aws/defaults/main.yml
   roles:
     # rerun common to set the hostname, nginx to set basic auth
     - common

playbooks/roles/aws/defaults/main.yml

@@ -30,7 +30,7 @@ AWS_S3_LOGS_FROM_EMAIL: dummy@example.com
 aws_role_name: aws
 aws_data_dir: "{{ COMMON_DATA_DIR }}/aws"
 aws_app_dir: "{{ COMMON_APP_DIR }}/aws"
-aws_s3_sync_script: "{{ aws_app_dir }}/send-logs-to-s3"
+aws_s3_sync_script: "{{ COMMON_APP_DIR }}/aws/send-logs-to-s3"
 aws_s3_logfile: "{{ aws_log_dir }}/s3-log-sync.log"
 aws_log_dir: "{{ COMMON_LOG_DIR }}/aws"
 aws_region: "us-east-1"

playbooks/roles/common/defaults/main.yml

@@ -12,6 +12,7 @@ COMMON_HTPASSWD_PASS: edx
 # have the AWS role installed
 COMMON_AWS_SYNC: False
 COMMON_AWS_SYNC_BUCKET: "edx-{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}"
+COMMON_AWS_S3_SYNC_SCRIPT: "{{ COMMON_APP_DIR }}/aws/send-logs-to-s3"
 COMMON_BASE_DIR: /edx
 COMMON_DATA_DIR: "{{ COMMON_BASE_DIR}}/var"
 COMMON_APP_DIR: "{{ COMMON_BASE_DIR}}/app"

playbooks/roles/common/templates/etc/logrotate.d/hourly/edx_logrotate_tracking_log.j2

@@ -13,7 +13,7 @@
   endscript
   lastaction
     {% if COMMON_AWS_SYNC -%}
-    {{ aws_s3_sync_script }} -d "{{ COMMON_LOG_DIR }}/tracking/*" -b "{{ COMMON_AWS_SYNC_BUCKET }}/logs/tracking"
+    {{ COMMON_S3_SYNC_SCRIPT }} -d "{{ COMMON_LOG_DIR }}/tracking/*" -b "{{ COMMON_AWS_SYNC_BUCKET }}/logs/tracking"
     {% endif -%}
   endscript
 }