Commit 84926ee7 by David Baumgold Committed by Feanil Patel

Switch from legacy variable templating system to Jinja2 everywhere

parent e6cfa717
......@@ -31,14 +31,14 @@
tasks:
- name: edX configuration
cloudformation: >
stack_name="$name" state=present
region=$region disable_rollback=false
stack_name="{{ name }}" state=present
region="{{ region }}" disable_rollback=false
template=../cloudformation_templates/edx-server-multi-instance.json
args:
template_parameters:
KeyName: $key
KeyName: "{{key}}"
InstanceType: m1.small
GroupTag: $group
GroupTag: "{{group}}"
register: stack
- name: show stack outputs
debug: msg="My stack outputs are ${stack.stack_outputs}"
debug: msg="My stack outputs are {{stack.stack_outputs}}"
......@@ -41,14 +41,14 @@ analytics_auth_config:
DATABASES:
analytics:
<<: *databases_default
USER: $AS_DB_ANALYTICS_USER
PASSWORD: $AS_DB_ANALYTICS_PASSWORD
HOST: $AS_DB_ANALYTICS_HOST
ANALYTICS_API_KEY: $AS_API_KEY
USER: "{{AS_DB_ANALYTICS_USER}}"
PASSWORD: "{{AS_DB_ANALYTICS_PASSWORD}}"
HOST: "{{AS_DB_ANALYTICS_HOST}}"
ANALYTICS_API_KEY: "{{AS_API_KEY}}"
ANALYTICS_RESULTS_DB:
MONGO_URI: $AS_DB_RESULTS_URL
MONGO_DB: $AS_DB_RESULTS_DB
MONGO_STORED_QUERIES_COLLECTION: $AS_DB_RESULTS_COLLECTION
MONGO_URI: "{{AS_DB_RESULTS_URL}}"
MONGO_DB: "{{AS_DB_RESULTS_DB}}"
MONGO_STORED_QUERIES_COLLECTION: "{{AS_DB_RESULTS_COLLECTION}}"
as_role_name: "analytics-server"
as_user: "analytics-server"
......
......@@ -28,7 +28,7 @@
accept_hostkey=yes
version={{ as_version }} force=true
environment:
GIT_SSH: $as_git_ssh
GIT_SSH: "{{as_git_ssh}}"
notify: restart the analytics service
notify: start the analytics service
tags:
......
......@@ -34,14 +34,14 @@ analytics_auth_config:
DATABASES:
analytics:
<<: *databases_default
USER: $ANALYTICS_DB_ANALYTICS_USER
PASSWORD: $ANALYTICS_DB_ANALYTICS_PASSWORD
HOST: $ANALYTICS_DB_ANALYTICS_HOST
ANALYTICS_API_KEY: $ANALYTICS_API_KEY
USER: "{{ ANALYTICS_DB_ANALYTICS_USER }}"
PASSWORD: "{{ ANALYTICS_DB_ANALYTICS_PASSWORD }}"
HOST: "{{ ANALYTICS_DB_ANALYTICS_HOST }}"
ANALYTICS_API_KEY: "{{ ANALYTICS_API_KEY }}"
ANALYTICS_RESULTS_DB:
MONGO_URI: $ANALYTICS_DB_RESULTS_URL
MONGO_DB: $ANALYTICS_DB_RESULTS_DB
MONGO_STORED_QUERIES_COLLECTION: $ANALYTICS_DB_RESULTS_COLLECTION
MONGO_URI: "{{ ANALYTICS_DB_RESULTS_URL }}"
MONGO_DB: "{{ ANALYTICS_DB_RESULTS_DB }}"
MONGO_STORED_QUERIES_COLLECTION: "{{ ANALYTICS_DB_RESULTS_COLLECTION }}"
analytics_role_name: "analytics"
analytics_user: "analytics"
......
......@@ -28,7 +28,7 @@
accept_hostkey=yes
version={{ analytics_version }} force=true
environment:
GIT_SSH: $analytics_git_ssh
GIT_SSH: "{{ analytics_git_ssh }}"
notify: restart the analytics service
notify: start the analytics service
tags:
......
......@@ -71,25 +71,25 @@ certs_env_config:
# CERTS_DATA is legacy, not used
CERT_DATA: {}
QUEUE_NAME: "certificates"
QUEUE_URL: $CERTS_QUEUE_URL
CERT_BUCKET: $CERTS_BUCKET
QUEUE_URL: "{{CERTS_QUEUE_URL}}"
CERT_BUCKET: "{{CERTS_BUCKET}}"
# gnupg signing key
CERT_KEY_ID: $CERTS_KEY_ID
CERT_KEY_ID: "{{CERTS_KEY_ID}}"
LOGGING_ENV: ""
CERT_GPG_DIR: $certs_gpg_dir
CERT_URL: $CERTS_URL
CERT_DOWNLOAD_URL: $CERTS_DOWNLOAD_URL
CERT_WEB_ROOT: $CERTS_WEB_ROOT
COPY_TO_WEB_ROOT: $CERTS_COPY_TO_WEB_ROOT
S3_UPLOAD: $CERTS_S3_UPLOAD
CERT_VERIFY_URL: $CERTS_VERIFY_URL
TEMPLATE_DATA_DIR: $CERTS_TEMPLATE_DATA_DIR
CERT_GPG_DIR: "{{certs_gpg_dir}}"
CERT_URL: "{{CERTS_URL}}"
CERT_DOWNLOAD_URL: "{{CERTS_DOWNLOAD_URL}}"
CERT_WEB_ROOT: "{{CERTS_WEB_ROOT}}"
COPY_TO_WEB_ROOT: "{{CERTS_COPY_TO_WEB_ROOT}}"
S3_UPLOAD: "{{CERTS_S3_UPLOAD}}"
CERT_VERIFY_URL: "{{CERTS_VERIFY_URL}}"
TEMPLATE_DATA_DIR: "{{CERTS_TEMPLATE_DATA_DIR}}"
certs_auth_config:
QUEUE_USER: $CERTS_QUEUE_USER
QUEUE_PASS: $CERTS_QUEUE_PASS
QUEUE_AUTH_USER: $CERTS_XQUEUE_AUTH_USER
QUEUE_AUTH_PASS: $CERTS_XQUEUE_AUTH_PASS
CERT_KEY_ID: $CERTS_KEY_ID
CERT_AWS_ID: $CERTS_AWS_ID
CERT_AWS_KEY: $CERTS_AWS_KEY
QUEUE_USER: "{{CERTS_QUEUE_USER}}"
QUEUE_PASS: "{{CERTS_QUEUE_PASS}}"
QUEUE_AUTH_USER: "{{CERTS_XQUEUE_AUTH_USER}}"
QUEUE_AUTH_PASS: "{{CERTS_XQUEUE_AUTH_PASS}}"
CERT_KEY_ID: "{{CERTS_KEY_ID}}"
CERT_AWS_ID: "{{CERTS_AWS_ID}}"
CERT_AWS_KEY: "{{CERTS_AWS_KEY}}"
......@@ -53,23 +53,23 @@ discern_env_config:
discern_auth_config:
AWS_ACCESS_KEY_ID: $DISCERN_AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY: $DISCERN_SECRET_ACCESS_KEY
BROKER_URL: $DISCERN_BROKER_URL
AWS_ACCESS_KEY_ID: "{{DISCERN_AWS_ACCESS_KEY_ID}}"
AWS_SECRET_ACCESS_KEY: "{{DISCERN_SECRET_ACCESS_KEY}}"
BROKER_URL: "{{DISCERN_BROKER_URL}}"
CACHES:
default:
BACKEND: 'django.core.cache.backends.memcached.MemcachedCache'
LOCATION: $DISCERN_MEMCACHE
CELERY_RESULT_BACKEND: $DISCERN_RESULT_BACKEND
LOCATION: "{{DISCERN_MEMCACHE}}"
CELERY_RESULT_BACKEND: "{{DISCERN_RESULT_BACKEND}}"
DATABASES:
default:
ENGINE: django.db.backends.mysql
HOST: $DISCERN_MYSQL_HOST
NAME: $DISCERN_MYSQL_DB_NAME
PASSWORD: $DISCERN_MYSQL_PASSWORD
PORT: $DISCERN_MYSQL_PORT
USER: $DISCERN_MYSQL_USER
GOOGLE_ANALYTICS_PROPERTY_ID: $DISCERN_GOOGLE_ANALYTICS_PROPERTY_ID
HOST: "{{DISCERN_MYSQL_HOST}}"
NAME: "{{DISCERN_MYSQL_DB_NAME}}"
PASSWORD: "{{DISCERN_MYSQL_PASSWORD}}"
PORT: "{{DISCERN_MYSQL_PORT}}"
USER: "{{DISCERN_MYSQL_USER}}"
GOOGLE_ANALYTICS_PROPERTY_ID: "{{DISCERN_GOOGLE_ANALYTICS_PROPERTY_ID}}"
discern_debian_pkgs:
......
......@@ -24,4 +24,4 @@ flower_deploy_path: "{{ flower_venv_bin }}:/usr/local/sbin:/usr/local/bin:/usr/b
flower_broker: "amqp://{{ FLOWER_BROKER_USERNAME }}:{{ FLOWER_BROKER_PASSWORD }}@{{ FLOWER_BROKER_HOST }}:{{ FLOWER_BROKER_PORT }}"
flower_environment:
PATH: $flower_deploy_path
PATH: "{{flower_deploy_path}}"
......@@ -9,12 +9,12 @@
#
##
# Role includes for role jenkins_admin
#
#
# Example:
#
# dependencies:
# - {
# role: my_role
# role: my_role
# my_role_var0: "foo"
# my_role_var1: "bar"
# }
......@@ -22,7 +22,7 @@ dependencies:
- common
- aws
- role: jenkins_master
jenkins_plugins: $jenkins_admin_plugins
jenkins_plugins: "{{jenkins_admin_plugins}}"
- role: supervisor
supervisor_app_dir: "{{ jenkins_supervisor_app_dir }}"
supervisor_data_dir: "{{ jenkins_supervisor_data_dir }}"
......
......@@ -21,7 +21,7 @@
module: ec2
state: 'absent'
region: "{{ region }}"
instance_ids: ${tag_lookup.instance_ids}
instance_ids: "{{tag_lookup.instance_ids}}"
when: terminate_instance == true and tag_lookup.instance_ids|length == 1
- name: deregister instance from an an elb if it was in one
......
......@@ -32,7 +32,7 @@
get_url: url={{ logstash_url }} dest={{ logstash_app_dir }}/share/{{ logstash_file }}
- name: ensure symlink with no version exists at {{ logstash_app_dir }}/share/logstash.jar
file: src={{ logstash_app_dir }}/share/${logstash_file} dest={{ logstash_app_dir }}/share/logstash.jar state=link
file: src={{ logstash_app_dir }}/share/{{logstash_file}} dest={{ logstash_app_dir }}/share/logstash.jar state=link
- name: start logstash
action: service name=logstash state=started enabled=yes
......
......@@ -87,61 +87,61 @@ ora_gunicorn_host: 127.0.0.1
# appropriate for running all edX
# services on a single server.
ora_env_config:
LOGGING_ENV: $ORA_LOGGING_ENV
LOGGING_ENV: "{{ORA_LOGGING_ENV}}"
LOG_DIR: "{{ COMMON_DATA_DIR }}/logs/xqueue"
COURSE_DATA_PATH: "{{ ora_data_course_dir }}"
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
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
S3_BUCKETNAME: "{{ORA_S3_BUCKETNAME}}"
ora_auth_config:
USERS: $ORA_USERS
USERS: "{{ORA_USERS}}"
XQUEUE_INTERFACE:
django_auth:
username: $ORA_XQUEUE_DJANGO_USER
password: $ORA_XQUEUE_DJANGO_PASSWORD
basic_auth: [ $ORA_XQUEUE_BASIC_AUTH_USER, $ORA_XQUEUE_BASIC_AUTH_PASSWORD ]
url: $ORA_XQUEUE_URL
username: "{{ORA_XQUEUE_DJANGO_USER}}"
password: "{{ORA_XQUEUE_DJANGO_PASSWORD}}"
basic_auth: [ "{{ORA_XQUEUE_BASIC_AUTH_USER}}", "{{ORA_XQUEUE_BASIC_AUTH_PASSWORD}}" ]
url: "{{ORA_XQUEUE_URL}}"
GRADING_CONTROLLER_INTERFACE:
django_auth:
password: $ORA_DJANGO_PASSWORD
username: $ORA_DJANGO_USER
url: $ORA_URL
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
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_environment:
SERVICE_VARIANT: ora
LANG: $ORA_LANG
PATH: $ora_deploy_path
LANG: "{{ORA_LANG}}"
PATH: "{{ora_deploy_path}}"
ora_debian_pkgs:
- python-software-properties
......
......@@ -53,8 +53,8 @@ rabbitmq_ip: "{{ ansible_default_ipv4.address }}"
# Structure for auth config file.
rabbitmq_auth_config:
erlang_cookie: $RABBIT_ERLANG_COOKIE
admins: $RABBIT_USERS
erlang_cookie: "{{RABBIT_ERLANG_COOKIE}}"
admins: "{{RABBIT_USERS}}"
rabbitmq_clustered_hosts: []
......
......@@ -124,7 +124,7 @@
configure_priv='.*' tags="administrator" state=present
vhost={{ item[1] }}
with_nested:
- ${rabbitmq_auth_config.admins}
- "{{rabbitmq_auth_config.admins}}"
- RABBITMQ_VHOSTS
when: "'admins' in rabbitmq_auth_config"
tags:
......
......@@ -56,33 +56,33 @@ xqueue_gunicorn_port: 8040
xqueue_gunicorn_host: 127.0.0.1
xqueue_env_config:
XQUEUES: $XQUEUE_QUEUES
XQUEUE_WORKERS_PER_QUEUE: $XQUEUE_WORKERS_PER_QUEUE
LOGGING_ENV : $XQUEUE_LOGGING_ENV
SYSLOG_SERVER: $XQUEUE_SYSLOG_SERVER
LOG_DIR : "{{ COMMON_DATA_DIR }}/logs/xqueue"
RABBIT_HOST : $XQUEUE_RABBITMQ_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: "{{XQUEUE_WORKERS_PER_QUEUE}}"
LOGGING_ENV: "{{XQUEUE_LOGGING_ENV}}"
SYSLOG_SERVER: "{{XQUEUE_SYSLOG_SERVER}}"
LOG_DIR: "{{ COMMON_DATA_DIR }}/logs/xqueue"
RABBIT_HOST: "{{XQUEUE_RABBITMQ_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_USER, $XQUEUE_BASIC_AUTH_PASSWORD]
USERS: $XQUEUE_DJANGO_USERS
AWS_ACCESS_KEY_ID: "{{XQUEUE_AWS_ACCESS_KEY_ID}}"
AWS_SECRET_ACCESS_KEY: "{{XQUEUE_AWS_SECRET_ACCESS_KEY}}"
REQUESTS_BASIC_AUTH: ["{{XQUEUE_BASIC_AUTH_USER}}", "{{XQUEUE_BASIC_AUTH_PASSWORD}}"]
USERS: "{{XQUEUE_DJANGO_USERS}}"
DATABASES:
default:
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
RABBITMQ_USER: $XQUEUE_RABBITMQ_USER
RABBITMQ_PASS: $XQUEUE_RABBITMQ_PASS
NAME: "{{XQUEUE_MYSQL_DB_NAME}}"
USER: "{{XQUEUE_MYSQL_USER}}"
PASSWORD: "{{XQUEUE_MYSQL_PASSWORD}}"
HOST: "{{XQUEUE_MYSQL_HOST}}"
PORT: "{{XQUEUE_MYSQL_PORT}}"
RABBITMQ_USER: "{{XQUEUE_RABBITMQ_USER}}"
RABBITMQ_PASS: "{{XQUEUE_RABBITMQ_PASS}}"
xqueue_source_repo: https://github.com/edx/xqueue.git
xqueue_source_repo: "https://github.com/edx/xqueue.git"
xqueue_version: 'HEAD'
xqueue_pre_requirements_file: "{{ xqueue_code_dir }}/pre-requirements.txt"
xqueue_post_requirements_file: "{{ xqueue_code_dir }}/requirements.txt"
......
......@@ -32,11 +32,11 @@ xserver_grader_root: "{{ XSERVER_GRADER_DIR }}/graders"
xserver_git_identity: "{{ xserver_app_dir }}/xserver-identity"
xserver_env_config:
RUN_URL: $XSERVER_RUN_URL
GRADER_ROOT: $xserver_grader_root
LOGGING_ENV: $XSERVER_LOGGING_ENV
RUN_URL: "{{XSERVER_RUN_URL}}"
GRADER_ROOT: "{{xserver_grader_root}}"
LOGGING_ENV: "{{XSERVER_LOGGING_ENV}}"
LOG_DIR: "{{ xserver_log_dir }}"
SYSLOG_SERVER: $XSERVER_SYSLOG_SERVER
SYSLOG_SERVER: "{{XSERVER_SYSLOG_SERVER}}"
SANDBOX_PYTHON: '{{ xserver_venv_sandbox_dir }}/bin/python'
xserver_source_repo: "git://github.com/edx/xserver.git"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment