removing quotes around keys in the config hashes

playbooks/roles/edxapp/defaults/main.yml

@@ -77,124 +77,124 @@ EDXAPP_RABBIT_HOSTNAME: 'rabbit.{{ENV_NAME}}.vpc.edx.org'
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
 #see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
 edxapp_generic_auth_config:  &edxapp_generic_auth
-  'AWS_ACCESS_KEY_ID':  $EDXAPP_AWS_ACCESS_KEY_ID
-  'AWS_SECRET_ACCESS_KEY': $EDXAPP_AWS_SECRET_ACCESS_KEY
-  'SECRET_KEY':  $EDXAPP_EDXAPP_SECRET_KEY
-  'XQUEUE_INTERFACE':
-    'basic_auth': $EDXAPP_XQUEUE_BASIC_AUTH
-    'django_auth': $EDXAPP_XQUEUE_DJANGO_AUTH
-    'url': $EDXAPP_XQUEUE_URL
-  'CONTENTSTORE':
-    'ENGINE':  'xmodule.contentstore.mongo.MongoContentStore'
-    'OPTIONS':
-      'db': $EDXAPP_MONGO_DB_NAME
-      'host': $EDXAPP_MONGO_HOSTS
-      'password': $EDXAPP_MONGO_PASSWORD
-      'port': $EDXAPP_MONGO_PORT
-      'user': $EDXAPP_MONGO_USER
-  'MODULESTORE':
-    'default':
-      'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore'
-      'OPTIONS':  &generic_modulestore_default_options
-        'collection':  'modulestore'
-        'db':  $EDXAPP_MONGO_DB_NAME
-        'default_class':  'xmodule.hidden_module.HiddenDescriptor'
-        'fs_root':  '/opt/wwc/data'
-        'host': $EDXAPP_MONGO_HOSTS
-        'password':  $EDXAPP_MONGO_PASSWORD
-        'port': $EDXAPP_MONGO_PORT
-        'render_template':  'mitxmako.shortcuts.render_to_string'
-        'user': $EDXAPP_MONGO_USER
+  AWS_ACCESS_KEY_ID:  $EDXAPP_AWS_ACCESS_KEY_ID
+  AWS_SECRET_ACCESS_KEY: $EDXAPP_AWS_SECRET_ACCESS_KEY
+  SECRET_KEY:  $EDXAPP_EDXAPP_SECRET_KEY
+  XQUEUE_INTERFACE:
+    basic_auth: $EDXAPP_XQUEUE_BASIC_AUTH
+    django_auth: $EDXAPP_XQUEUE_DJANGO_AUTH
+    url: $EDXAPP_XQUEUE_URL
+  CONTENTSTORE:
+    ENGINE:  'xmodule.contentstore.mongo.MongoContentStore'
+    OPTIONS:
+      db: $EDXAPP_MONGO_DB_NAME
+      host: $EDXAPP_MONGO_HOSTS
+      password: $EDXAPP_MONGO_PASSWORD
+      port: $EDXAPP_MONGO_PORT
+      user: $EDXAPP_MONGO_USER
+  MODULESTORE:
+    default:
+      ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore'
+      OPTIONS:  &generic_modulestore_default_options
+        collection:  'modulestore'
+        db:  $EDXAPP_MONGO_DB_NAME
+        default_class:  'xmodule.hidden_module.HiddenDescriptor'
+        fs_root:  '/opt/wwc/data'
+        host: $EDXAPP_MONGO_HOSTS
+        password:  $EDXAPP_MONGO_PASSWORD
+        port: $EDXAPP_MONGO_PORT
+        render_template:  'mitxmako.shortcuts.render_to_string'
+        user: $EDXAPP_MONGO_USER
     # Needed for the CMS to be able to run update_templates
-    'direct':
-      'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore'
-      'OPTIONS':  *generic_modulestore_default_options
-  'DATABASES':
-    'default':
-      'ENGINE': 'django.db.backends.mysql'
-      'NAME': $EDXAPP_MYSQL_DB_NAME
-      'USER': $EDXAPP_MYSQL_USER
-      'PASSWORD': $EDXAPP_MYSQL_PASSWORD
-      'HOST': $EDXAPP_MYSQL_HOST
-      'PORT': $EDXAPP_MYSQL_PORT
-  'PEARSON_TEST_PASSWORD':  $EDXAPP_PEARSON_TEST_PASSWORD
-  'OPEN_ENDED_GRADING_INTERFACE':
-    'url': $EDXAPP_OEE_URL
-    'password': $EDXAPP_OEE_PASSWORD
-    'peer_grading':  'peer_grading'
-    'staff_grading':  'staff_grading'
-    'grading_controller':  'grading_controller'
-    'username': $EDXAPP_OEE_USER
-  'ANALYTICS_API_KEY':  $EDXAPP_ANALYTICS_API_KEY
-  'ZENDESK_USER': $EDXAPP_ZENDESK_USER
-  'ZENDESK_API_KEY': $EDXAPP_ZENDESK_API_KEY
-  'CELERY_BROKER_USER': $EDXAPP_CELERY_USER
-  'CELERY_BROKER_PASSWORD': $EDXAPP_CELERY_PASSWORD
+    direct:
+      ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
+      OPTIONS:  *generic_modulestore_default_options
+  DATABASES:
+    default:
+      ENGINE: 'django.db.backends.mysql'
+      NAME: $EDXAPP_MYSQL_DB_NAME
+      USER: $EDXAPP_MYSQL_USER
+      PASSWORD: $EDXAPP_MYSQL_PASSWORD
+      HOST: $EDXAPP_MYSQL_HOST
+      PORT: $EDXAPP_MYSQL_PORT
+  PEARSON_TEST_PASSWORD:  $EDXAPP_PEARSON_TEST_PASSWORD
+  OPEN_ENDED_GRADING_INTERFACE:
+    url: $EDXAPP_OEE_URL
+    password: $EDXAPP_OEE_PASSWORD
+    peer_grading:  'peer_grading'
+    staff_grading:  'staff_grading'
+    grading_controller:  'grading_controller'
+    username: $EDXAPP_OEE_USER
+  ANALYTICS_API_KEY:  $EDXAPP_ANALYTICS_API_KEY
+  ZENDESK_USER: $EDXAPP_ZENDESK_USER
+  ZENDESK_API_KEY: $EDXAPP_ZENDESK_API_KEY
+  CELERY_BROKER_USER: $EDXAPP_CELERY_USER
+  CELERY_BROKER_PASSWORD: $EDXAPP_CELERY_PASSWORD
 
 generic_env_config:  &edxapp_generic_env
-  'LMS_BASE': $EDXAPP_LMS_BASE
-  'CMS_BASE': $EDXAPP_CMS_BASE
-  'BOOK_URL':  $EDXAPP_BOOK_URL
-  'CERT_QUEUE':  'certificates'
-  'LOCAL_LOGLEVEL': $EDXAPP_LOG_LEVEL
+  LMS_BASE: $EDXAPP_LMS_BASE
+  CMS_BASE: $EDXAPP_CMS_BASE
+  BOOK_URL:  $EDXAPP_BOOK_URL
+  CERT_QUEUE:  'certificates'
+  LOCAL_LOGLEVEL: $EDXAPP_LOG_LEVEL
   # default email backed set to local SMTP
-  'EMAIL_BACKEND': $EDXAPP_EMAIL_BACKEND
-  'MITX_FEATURES': $EDXAPP_MITX_FEATURES
-  'WIKI_ENABLED': true
-  'SYSLOG_SERVER':  $EDXAPP_SYSLOG_SERVER
-  'SITE_NAME':  $EDXAPP_SITE_NAME
-  'LOG_DIR':  '/mnt/logs/edx'
-  'MEDIA_URL':  $EDXAPP_MEDIA_URL
-  'ANALYTICS_SERVER_URL':  $EDXAPP_ANALYTICS_SERVER_URL
-  'FEEDBACK_SUBMISSION_EMAIL': $EDXAPP_FEEDBACK_SUBMISSION_EMAIL
-  'TIME_ZONE': 'America/New_York'
-  'CACHES':
-    'default': &default_generic_cache
-      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
-      'KEY_FUNCTION':  'util.memcache.safe_key'
-      'KEY_PREFIX':  'sandbox_default'
-      'LOCATION': $EDXAPP_MEMCACHE
-    'general':
+  EMAIL_BACKEND: $EDXAPP_EMAIL_BACKEND
+  MITX_FEATURES: $EDXAPP_MITX_FEATURES
+  WIKI_ENABLED: true
+  SYSLOG_SERVER:  $EDXAPP_SYSLOG_SERVER
+  SITE_NAME:  $EDXAPP_SITE_NAME
+  LOG_DIR:  '/mnt/logs/edx'
+  MEDIA_URL:  $EDXAPP_MEDIA_URL
+  ANALYTICS_SERVER_URL:  $EDXAPP_ANALYTICS_SERVER_URL
+  FEEDBACK_SUBMISSION_EMAIL: $EDXAPP_FEEDBACK_SUBMISSION_EMAIL
+  TIME_ZONE: 'America/New_York'
+  CACHES:
+    default: &default_generic_cache
+      BACKEND:  'django.core.cache.backends.memcached.MemcachedCache'
+      KEY_FUNCTION:  'util.memcache.safe_key'
+      KEY_PREFIX:  'sandbox_default'
+      LOCATION: $EDXAPP_MEMCACHE
+    general:
       <<: *default_generic_cache
-      'KEY_PREFIX':  'sandbox_general'
-    'mongo_metadata_inheritance':
+      KEY_PREFIX:  'sandbox_general'
+    mongo_metadata_inheritance:
       <<: *default_generic_cache
-      'KEY_PREFIX':  'integration_mongo_metadata_inheritance'
-    'staticfiles':
+      KEY_PREFIX:  'integration_mongo_metadata_inheritance'
+    staticfiles:
       <<: *default_generic_cache
-      'KEY_PREFIX':  'integration_static_files'
-    'celery':
+      KEY_PREFIX:  'integration_static_files'
+    celery:
       <<: *default_generic_cache
-      'KEY_PREFIX':  'integration_celery'
-  'CELERY_BROKER_TRANSPORT': 'amqp'
-  'CELERY_BROKER_HOSTNAME': $EDXAPP_RABBIT_HOSTNAME
-  'COMMENTS_SERVICE_URL': $EDXAPP_COMMENTS_SERVICE_URL
-  'LOGGING_ENV': $EDXAPP_LOGGING_ENV
-  'SESSION_COOKIE_DOMAIN':  !!null
-  'COMMENTS_SERVICE_KEY': $EDXAPP_COMMENTS_SERVICE_KEY
-  'SEGMENT_IO_LMS': true
-  'CODE_JAIL':
-    'limits':
-      'VMEM': 0
-      'REALTIME': 3
+      KEY_PREFIX:  'integration_celery'
+  CELERY_BROKER_TRANSPORT: 'amqp'
+  CELERY_BROKER_HOSTNAME: $EDXAPP_RABBIT_HOSTNAME
+  COMMENTS_SERVICE_URL: $EDXAPP_COMMENTS_SERVICE_URL
+  LOGGING_ENV: $EDXAPP_LOGGING_ENV
+  SESSION_COOKIE_DOMAIN:  !!null
+  COMMENTS_SERVICE_KEY: $EDXAPP_COMMENTS_SERVICE_KEY
+  SEGMENT_IO_LMS: true
+  CODE_JAIL:
+    limits:
+      VMEM: 0
+      REALTIME: 3
 
 lms_auth_config:
   <<: *edxapp_generic_auth
-  'MODULESTORE':
-    'default':
-      'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore'
-      'OPTIONS': *generic_modulestore_default_options
+  MODULESTORE:
+    default:
+      ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
+      OPTIONS: *generic_modulestore_default_options
 
 lms_env_config:
   <<: *edxapp_generic_env
 lms_xml_auth_config:
   <<: *edxapp_generic_auth
-  'MODULESTORE':
-    'default':
-      'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore'
-      'OPTIONS':
-        'data_dir': '/opt/wwc/data'
-        'default_class': 'xmodule.hidden_module.HiddenDescriptor'
+  MODULESTORE:
+    default:
+      ENGINE: 'xmodule.modulestore.xml.XMLModuleStore'
+      OPTIONS:
+        data_dir: '/opt/wwc/data'
+        default_class: 'xmodule.hidden_module.HiddenDescriptor'
 lms_xml_env_config:
   <<: *edxapp_generic_env
 cms_auth_config: