Removed AWS access key and secret variables for the Catalog Service

These defaults are conflicting with the overrides.

ECOM-6238

playbooks/roles/discovery/defaults/main.yml

@@ -106,9 +106,7 @@ DISCOVERY_STATICFILES_STORAGE: 'django.contrib.staticfiles.storage.StaticFilesSt
 # https://docs.djangoproject.com/en/1.9/topics/email/#email-backends
 DISCOVERY_EMAIL_BACKEND: 'django_ses.SESBackend'
 
-# For email backend django-ses, following settings are required
-DISCOVERY_AWS_ACCESS_KEY_ID: 'None'
-DISCOVERY_AWS_SECRET_ACCESS_KEY: 'None'
+# For email backend django-ses, the following settings are required
 DISCOVERY_AWS_SES_REGION_NAME: 'us-east-1'
 DISCOVERY_AWS_SES_REGION_ENDPOINT: 'email.us-east-1.amazonaws.com'
 
@@ -168,8 +166,6 @@ DISCOVERY_SERVICE_CONFIG:
   EMAIL_BACKEND: '{{ DISCOVERY_EMAIL_BACKEND }}'
 
   # Settings for django-ses email backend
-  AWS_ACCESS_KEY_ID:  '{{ DISCOVERY_AWS_ACCESS_KEY_ID }}'
-  AWS_SECRET_ACCESS_KEY: '{{ DISCOVERY_AWS_SECRET_ACCESS_KEY }}'
   AWS_SES_REGION_NAME: '{{ DISCOVERY_AWS_SES_REGION_NAME }}'
   AWS_SES_REGION_ENDPOINT: '{{ DISCOVERY_AWS_SES_REGION_ENDPOINT }}'