From e4bf79c24b0826f70e30b6ea4390845ce5b89db0 Mon Sep 17 00:00:00 2001
From: sundarit <sundari@crystaldelta.com>
Date: Wed, 26 Aug 2020 18:15:03 +0530
Subject: [PATCH] credential fix

---
 playbooks/roles/ecommerce/defaults/main.yml  | 12 ++++++++++++
 playbooks/roles/ecomworker/defaults/main.yml |  1 +
 2 files changed, 13 insertions(+)

diff --git a/playbooks/roles/ecommerce/defaults/main.yml b/playbooks/roles/ecommerce/defaults/main.yml
index 7845ab69af5..c9e6529c8c0 100644
--- a/playbooks/roles/ecommerce/defaults/main.yml
+++ b/playbooks/roles/ecommerce/defaults/main.yml
@@ -96,6 +96,12 @@ ECOMMERCE_CYBERSOURCE_CANCEL_PAGE_URL: '/checkout/cancel-checkout/'
 ECOMMERCE_CYBERSOURCE_SEND_LEVEL_2_3_DETAILS: true
 ECOMMERCE_CYBERSOURCE_SOAP_API_URL: 'https://ics2wstest.ic3.com/commerce/1.x/transactionProcessor/CyberSourceTransaction_1.140.wsdl'
 
+# ElasticAPM
+ECOMMERCE_ELASTIC_APM_SERVICE_NAME: 'SET-ME-PLEASE'
+ECOMMERCE_ELASTIC_APM_SERVER_URL: 'SET-ME-PLEASE'
+ECOMMERCE_ELASTIC_APM_ENVIRONMENT: 'SET-ME-PLEASE'
+ECOMMERCE_ELASTIC_APM_SECRET_TOKEN: 'SET-ME-PLEASE'
+
 # PayPal
 ECOMMERCE_PAYPAL_MODE: 'sandbox'
 ECOMMERCE_PAYPAL_CLIENT_ID: 'SET-ME-PLEASE'
@@ -157,6 +163,7 @@ ECOMMERCE_BROKER_URL: '{{ ECOMMERCE_BROKER_TRANSPORT }}://{{ ECOMMERCE_BROKER_US
 ECOMMERCE_DISCOVERY_SERVICE_URL: 'http://localhost:8008'
 ECOMMERCE_ENTERPRISE_URL: '{{ ECOMMERCE_LMS_URL_ROOT }}'
 
+
 ecommerce_service_config_overrides:
   LANGUAGE_COOKIE_NAME: '{{ ECOMMERCE_LANGUAGE_COOKIE_NAME }}'
   EDX_API_KEY: '{{ ECOMMERCE_EDX_API_KEY }}'
@@ -193,6 +200,11 @@ ecommerce_service_config_overrides:
   DEFAULT_SITE_THEME: "{{ ECOMMERCE_DEFAULT_SITE_THEME }}"
   CSRF_COOKIE_SECURE: "{{ ECOMMERCE_CSRF_COOKIE_SECURE }}"
   SESSION_COOKIE_SECURE: '{{ ECOMMERCE_SESSION_COOKIE_SECURE}}'
+  # ElasticAPM
+  ELASTIC_APM_SERVICE_NAME: '{{ ECOMMERCE_ELASTIC_APM_SERVICE_NAME }}'
+  ELASTIC_APM_SERVER_URL: '{{ ECOMMERCE_ELASTIC_APM_SERVER_URL }}'
+  ELASTIC_APM_ENVIRONMENT: '{{ ECOMMERCE_ELASTIC_APM_ENVIRONMENT }}'
+  ELASTIC_APM_SECRET_TOKEN: '{{ ECOMMERCE_ELASTIC_APM_SECRET_TOKEN }}'
 
 ECOMMERCE_GUNICORN_WORKER_CLASS: "gevent"
 ECOMMERCE_GUNICORN_MAX_REQUESTS: 3000
diff --git a/playbooks/roles/ecomworker/defaults/main.yml b/playbooks/roles/ecomworker/defaults/main.yml
index bdf59d9762e..a631d1fa73d 100644
--- a/playbooks/roles/ecomworker/defaults/main.yml
+++ b/playbooks/roles/ecomworker/defaults/main.yml
@@ -138,6 +138,7 @@ ECOMMERCE_WORKER_SERVICE_CONFIG:
 
 
 ecommerce_worker_environment:
+  TZ: 'Australia/Melbourne'
   WORKER_CONFIGURATION_MODULE: 'ecommerce_worker.configuration.production'
   ECOMMERCE_WORKER_CFG: '{{ COMMON_CFG_DIR }}/{{ ecommerce_worker_service_name }}.yml'