supervisor-ora: Expose individual config variables for ORA

playbooks/roles/ora/defaults/main.yml

@@ -24,6 +24,49 @@ ora_ease_version: 'HEAD'
 ora_ease_pre_requirements_file: "{{ ora_ease_code_dir }}/pre-requirements.txt"
 ora_ease_post_requirements_file: "{{ ora_ease_code_dir }}/requirements.txt"
 
+ORA_LOGGING_ENV: "prod-grader"
+ORA_REQUESTS_TIMEOUT: 5
+ORA_QUEUES_TO_PULL_FROM: "open-ended"
+ORA_TIME_BETWEEN_XQUEUE_PULLS: 5
+ORA_TIME_BETWEEN_EXPIRED_CHECKS: 1800
+ORA_GRADER_SETTINGS_DIRECTORY: "grader_settings/"
+ORA_MAX_NUMBER_OF_TIMES_TO_RETRY_GRADING: 10
+ORA_MIN_TO_USE_ML: 100
+ORA_ML_PATH: "machine-learning/"
+ORA_ML_MODEL_PATH: "ml_models/"
+ORA_TIME_BETWEEN_ML_CREATOR_CHECKS: 300
+ORA_TIME_BETWEEN_ML_GRADER_CHECKS: 5
+ORA_MIN_TO_USE_PEER: 10
+ORA_PEER_GRADER_COUNT: 3
+ORA_PEER_GRADER_MINIMUM_TO_CALIBRATE: 3
+ORA_PEER_GRADER_MAXIMUM_TO_CALIBRATE: 6
+ORA_PEER_GRADER_MIN_NORMALIZED_CALIBRATION_ERROR: 0.5
+ORA_EXPIRE_SUBMISSIONS_AFTER: 1296000
+ORA_RESET_SUBMISSIONS_AFTER: 600
+ORA_LOCAL_LOGLEVEL: "DEBUG"
+ORA_DEBUG: false
+ORA_SYSLOG_SERVER: "localhost"
+ORA_USE_S3_TO_STORE_MODELS: false
+ORA_S3_BUCKETNAME: "openended-prod"
+
+ORA_USERS:
+  "xqueue_pull": "password"
+  "lms": "password"
+
+ORA_XQUEUE_URL: "http://localhost:18040"
+
+ORA_DJANGO_USERNAME: "lms"
+ORA_DJANGO_PASSWORD: "password"
+ORA_URL: "http://localhost:18060"
+
+ORA_MYSQL_DB_NAME: 'ora'
+ORA_MYSQL_USER: 'root'
+ORA_MYSQL_PASSWORD: ''
+ORA_MYSQL_HOST: 'localhost'
+ORA_MYSQL_PORT: '3306'
+
+ORA_AWS_ACCESS_KEY_ID: ''
+ORA_AWS_SECRET_ACCESS_KEY: ''
 
 # Default nginx listen port
 # These should be overrided if you want
@@ -38,51 +81,55 @@ ora_gunicorn_host: 127.0.0.1
 # appropriate for running all edX
 # services on a single server.
 ora_env_config:
-  "LOGGING_ENV": "prod-grader"
-  "LOG_DIR": "/logs"
-  "REQUESTS_TIMEOUT": "5"
-  "QUEUES_TO_PULL_FROM": "open-ended"
-  "TIME_BETWEEN_XQUEUE_PULLS": "5"
-  "TIME_BETWEEN_EXPIRED_CHECKS": "1800"
-  "GRADER_SETTINGS_DIRECTORY": "grader_settings/"
-  "MAX_NUMBER_OF_TIMES_TO_RETRY_GRADING": "10"
-  "MIN_TO_USE_ML": "100"
-  "ML_PATH": "machine-learning/"
-  "ML_MODEL_PATH": "ml_models/"
-  "TIME_BETWEEN_ML_CREATOR_CHECKS": "300"
-  "TIME_BETWEEN_ML_GRADER_CHECKS": "5"
-  "MIN_TO_USE_PEER": "10"
-  "PEER_GRADER_COUNT": "3"
-  "PEER_GRADER_MINIMUM_TO_CALIBRATE": "3"
-  "PEER_GRADER_MAXIMUM_TO_CALIBRATE": "6"
-  "PEER_GRADER_MIN_NORMALIZED_CALIBRATION_ERROR": ".5"
-  "EXPIRE_SUBMISSIONS_AFTER": "1296000"
-  "RESET_SUBMISSIONS_AFTER": "600"
-  "LOCAL_LOGLEVEL": "DEBUG"
-  "DEBUG": false
-  "SYSLOG_SERVER": "localhost"
-  "USE_S3_TO_STORE_MODELS": false
-  "S3_BUCKETNAME": "openended-prod"
+  LOGGING_ENV: $ORA_LOGGING_ENV
+  LOG_DIR: "{{ COMMON_DATA_DIR }}/logs/xqueue"
+  REQUESTS_TIMEOUT: $ORA_REQUESTS_TIMEOUT
+  QUEUES_TO_PULL_FROM: $ORA_QUEUES_TO_PULL_FROM
+  TIME_BETWEEN_XQUEUE_PULLS: $ORA_TIME_BETWEEN_XQUEUE_PULLS
+  TIME_BETWEEN_EXPIRED_CHECKS: $ORA_TIME_BETWEEN_EXPIRED_CHECKS
+  GRADER_SETTINGS_DIRECTORY: $ORA_GRADER_SETTINGS_DIRECTORY
+  MAX_NUMBER_OF_TIMES_TO_RETRY_GRADING: $ORA_MAX_NUMBER_OF_TIMES_TO_RETRY_GRADING
+  MIN_TO_USE_ML: $ORA_MIN_TO_USE_ML
+  ML_PATH: $ORA_ML_PATH
+  ML_MODEL_PATH: $ORA_ML_MODEL_PATH
+  TIME_BETWEEN_ML_CREATOR_CHECKS: $ORA_TIME_BETWEEN_ML_CREATOR_CHECKS
+  TIME_BETWEEN_ML_GRADER_CHECKS: $ORA_TIME_BETWEEN_ML_GRADER_CHECKS
+  MIN_TO_USE_PEER: $ORA_MIN_TO_USE_PEER
+  PEER_GRADER_COUNT: $ORA_PEER_GRADER_COUNT
+  PEER_GRADER_MINIMUM_TO_CALIBRATE: $ORA_PEER_GRADER_MINIMUM_TO_CALIBRATE
+  PEER_GRADER_MAXIMUM_TO_CALIBRATE: $ORA_PEER_GRADER_MAXIMUM_TO_CALIBRATE
+  PEER_GRADER_MIN_NORMALIZED_CALIBRATION_ERROR: $ORA_PEER_GRADER_MIN_NORMALIZED_CALIBRATION_ERROR
+  EXPIRE_SUBMISSIONS_AFTER: $ORA_EXPIRE_SUBMISSIONS_AFTER
+  RESET_SUBMISSIONS_AFTER: $ORA_RESET_SUBMISSIONS_AFTER
+  LOCAL_LOGLEVEL: $ORA_LOCAL_LOGLEVEL
+  DEBUG: $ORA_DEBUG
+  SYSLOG_SERVER: ORA_SYSLOG_SERVER
+  USE_S3_TO_STORE_MODELS: ORA_USE_S3_TO_STORE_MODELS
+  S3_BUCKETNAME: $ORA_S3_BUCKETNAME
 
 ora_auth_config:
-  "USERS":
-    "xqueue_pull": "password"
-    "lms": "password"
-  "XQUEUE_INTERFACE":
-    "django_auth":
-      "password": "password"
-      "username": "lms"
-    "basic_auth": [ "edx", "edx"]
-    "url": "http://localhost:18040"
-  "GRADING_CONTROLLER_INTERFACE":
-    "django_auth":
-      "password": "password"
-      "username": "lms"
-    "url": "http://localhost:18060"
-  'DATABASES':
-    'default': { 'ENGINE': 'django.db.backends.mysql', 'NAME': 'ora', 'USER': 'root', 'PASSWORD': '', 'HOST': 'localhost', 'PORT': '3306' }
-  'AWS_ACCESS_KEY_ID' : ''
-  'AWS_SECRET_ACCESS_KEY' : ''
+  USERS: $ORA_USERS
+  XQUEUE_INTERFACE:
+    django_auth:
+      password: $XQUEUE_DJANGO_USER
+      username: $XQUEUE_DJANGO_PASSWORD
+    basic_auth: [$XQUEUE_BASIC_AUTH_USER, $XQUEUE_BASIC_AUTH_PASSWORD]
+    url: $ORA_XQUEUE_URL
+  GRADING_CONTROLLER_INTERFACE:
+    django_auth:
+      password: $ORA_DJANGO_PASSWORD
+      username: $ORA_DJANGO_USER
+    url: $ORA_URL
+  DATABASES:
+    default: 
+      ENGINE: 'django.db.backends.mysql'
+      NAME: $ORA_MYSQL_DB_NAME
+      USER: $ORA_MYSQL_USER
+      PASSWORD: $ORA_MYSQL_PASSWORD
+      HOST: $ORA_MYSQL_HOST
+      PORT: $ORA_MYSQL_PORT
+  AWS_ACCESS_KEY_ID: $ORA_AWS_ACCESS_KEY_ID
+  AWS_SECRET_ACCESS_KEY: $ORA_AWS_SECRET_ACCESS_KEY
 
 ora_debian_pkgs:
   - python-software-properties