Merge pull request #1934 from edx/feanil/moar_ecom_settings

Add and rearrange ecommerce settings.

playbooks/roles/ecommerce/defaults/main.yml

@@ -30,6 +30,8 @@ ECOMMERCE_DATABASES:
     PASSWORD: 'password'
     HOST: 'localhost'
     PORT: '3306'
+    ATOMIC_REQUESTS: true
+    CONN_MAX_AGE: 60
 
 ECOMMERCE_VERSION: "master"
 EDX_DJANGO_OSCAR_VERSION: "master"
@@ -51,11 +53,17 @@ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_URL_ROOT : 'some-secret'
 ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 
 # Cybersource related
-ECOMMERCE_PAYMENT_PROCESSOR_CLASS: 'extensions.payment.processors.Cybersource'
 ECOMMERCE_CYBERSOURCE_PROFILE_ID: 'SET-ME-PLEASE'
 ECOMMERCE_CYBERSOURCE_ACCESS_KEY: 'SET-ME-PLEASE'
 ECOMMERCE_CYBERSOURCE_SECRET_KEY: 'SET-ME-PLEASE'
 
+ECOMMERCE_PAYMENT_PROCESSOR_CONFIG:
+    cybersource:
+      profile_id: '{{ ECOMMERCE_CYBERSOURCE_PROFILE_ID }}'
+      access_key: '{{ ECOMMERCE_CYBERSOURCE_ACCESS_KEY }}'
+      secret_key: '{{ ECOMMERCE_CYBERSOURCE_SECRET_KEY }}'
+
+ECOMMERCE_ORDER_NUMBER_PREFIX: 'OSCR'
 
 ECOMMERCE_SERVICE_CONFIG:
   SECRET_KEY: '{{ ECOMMERCE_SECRET_KEY }}'
@@ -77,17 +85,15 @@ ECOMMERCE_SERVICE_CONFIG:
   SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ ECOMMERCE_LMS_URL_ROOT }}/oauth2'
   SOCIAL_AUTH_REDIRECT_IS_HTTPS: '{{ ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS }}'
 
-  PAYMENT_PROCESSOR_CLASS: '{{ ECOMMERCE_PAYMENT_PROCESSOR_CLASS }}'
-  CYBERSOURCE_PROFILE_ID: '{{ ECOMMERCE_CYBERSOURCE_PROFILE_ID }}'
-  CYBERSOURCE_ACCESS_KEY: '{{ ECOMMERCE_CYBERSOURCE_ACCESS_KEY }}'
-  CYBERSOURCE_SECRET_KEY: '{{ ECOMMERCE_CYBERSOURCE_SECRET_KEY }}'
-
   STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ ecommerce_service_name }}/staticfiles"
   # db config
   DATABASE_OPTIONS:
     connect_timeout: 10
   DATABASES: '{{ ECOMMERCE_DATABASES }}'
 
+  ORDER_NUMBER_PREFIX: '{{ ECOMMERCE_ORDER_NUMBER_PREFIX }}'
+  PAYMENT_PROCESSOR_CONFIG: '{{ ECOMMERCE_PAYMENT_PROCESSOR_CONFIG }}'
+
 
 ECOMMERCE_REPOS:
   - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"