Merge pull request #297 from edx/jarv/fix-xqueue-db-setting

change quoting for hash and adding ENGINE to DATABASES

playbooks/roles/xqueue/defaults/main.yml

@@ -41,28 +41,29 @@ XQUEUE_MYSQL_HOST: 'localhost'
 XQUEUE_MYSQL_PORT: '3306'
 
 xqueue_env_config:
-  'XQUEUES': $XQUEUE_QUEUES
-  'XQUEUE_WORKERS_PER_QUEUE': 12
-  'LOGGING_ENV' : $XQUEUE_LOGGING_ENV
-  'SYSLOG_SERVER': $XQUEUE_SYSLOG_SERVER
-  'LOG_DIR' : '/mnt/logs/xqueue'
-  'RABBIT_HOST' : $XQUEUE_RABBIT_HOSTNAME
-  'S3_BUCKET' : $XQUEUE_S3_BUCKET
-  'S3_PATH_PREFIX': $XQUEUE_S3_PATH_PREFIX
-  'LOCAL_LOGLEVEL': $XQUEUE_LOCAL_LOGLEVEL
+  XQUEUES: $XQUEUE_QUEUES
+  XQUEUE_WORKERS_PER_QUEUE: 12
+  LOGGING_ENV : $XQUEUE_LOGGING_ENV
+  SYSLOG_SERVER: $XQUEUE_SYSLOG_SERVER
+  LOG_DIR : '/mnt/logs/xqueue'
+  RABBIT_HOST : $XQUEUE_RABBIT_HOSTNAME
+  S3_BUCKET : $XQUEUE_S3_BUCKET
+  S3_PATH_PREFIX: $XQUEUE_S3_PATH_PREFIX
+  LOCAL_LOGLEVEL: $XQUEUE_LOCAL_LOGLEVEL
 
 xqueue_auth_config:
-  'AWS_ACCESS_KEY_ID':  $XQUEUE_AWS_ACCESS_KEY_ID
-  'AWS_SECRET_ACCESS_KEY': $XQUEUE_AWS_SECRET_ACCESS_KEY
-  'REQUESTS_BASIC_AUTH': $XQUEUE_BASIC_AUTH
-  'USERS': { '{{XQUEUE_DJANGO_USER}}' : $XQUEUE_DJANGO_PASSWORD }
-  'DATABASES':
+  AWS_ACCESS_KEY_ID:  $XQUEUE_AWS_ACCESS_KEY_ID
+  AWS_SECRET_ACCESS_KEY: $XQUEUE_AWS_SECRET_ACCESS_KEY
+  REQUESTS_BASIC_AUTH: $XQUEUE_BASIC_AUTH
+  USERS: { '{{XQUEUE_DJANGO_USER}}' : $XQUEUE_DJANGO_PASSWORD }
+  DATABASES:
     default:
-      'NAME': $XQUEUE_MYSQL_DB_NAME
-      'USER': $XQUEUE_MYSQL_USER
-      'PASSWORD': $XQUEUE_MYSQL_PASSWORD
-      'HOST': $XQUEUE_MYSQL_HOST
-      'PORT': $XQUEUE_MYSQL_PORT
+      ENGINE: "django.db.backends.mysql"
+      NAME: $XQUEUE_MYSQL_DB_NAME
+      USER: $XQUEUE_MYSQL_USER
+      PASSWORD: $XQUEUE_MYSQL_PASSWORD
+      HOST: $XQUEUE_MYSQL_HOST
+      PORT: $XQUEUE_MYSQL_PORT
 
 xqueue_create_db: 'yes'
 xqueue_source_repo: https://github.com/edx/xqueue.git