Merge pull request #1948 from edx/feanil/update_ansible

Feanil/update ansible

playbooks/roles/analytics_api/defaults/main.yml

@@ -63,7 +63,7 @@ ANALYTICS_API_SERVICE_CONFIG:
   EMAIL_HOST: '{{ ANALYTICS_API_EMAIL_HOST }}'
   EMAIL_HOST_PASSWORD: '{{ ANALYTICS_API_EMAIL_HOST_PASSWORD }}'
   EMAIL_HOST_USER: '{{ ANALYTICS_API_EMAIL_HOST_USER }}'
-  EMAIL_PORT: $ANALYTICS_API_EMAIL_PORT
+  EMAIL_PORT: '{{ ANALYTICS_API_EMAIL_PORT }}'
   API_AUTH_TOKEN: '{{ ANALYTICS_API_AUTH_TOKEN }}'
   STATICFILES_DIRS: ['static']
   STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ analytics_api_service_name }}/staticfiles"

playbooks/roles/edxapp/defaults/main.yml

@@ -163,10 +163,10 @@ EDXAPP_FEATURES:
   SUBDOMAIN_COURSE_LISTINGS: false
   PREVIEW_LMS_BASE: "{{ EDXAPP_PREVIEW_LMS_BASE }}"
   ENABLE_S3_GRADE_DOWNLOADS: true
-  USE_CUSTOM_THEME: $edxapp_use_custom_theme
-  ENABLE_MKTG_SITE: $EDXAPP_ENABLE_MKTG_SITE
-  AUTOMATIC_AUTH_FOR_TESTING: $EDXAPP_ENABLE_AUTO_AUTH
-  ENABLE_THIRD_PARTY_AUTH: $EDXAPP_ENABLE_THIRD_PARTY_AUTH
+  USE_CUSTOM_THEME: "{{ edxapp_use_custom_theme }}"
+  ENABLE_MKTG_SITE: "{{ EDXAPP_ENABLE_MKTG_SITE }}"
+  AUTOMATIC_AUTH_FOR_TESTING: "{{ EDXAPP_ENABLE_AUTO_AUTH }}"
+  ENABLE_THIRD_PARTY_AUTH: "{{ EDXAPP_ENABLE_THIRD_PARTY_AUTH }}"
   ENABLE_VIDEO_UPLOAD_PIPELINE: false
   ENABLE_DISCUSSION_HOME_PANEL: true
   ENABLE_COMBINED_LOGIN_REGISTRATION: true
@@ -175,7 +175,7 @@ EDXAPP_FEATURES:
   ENABLE_COUNTRY_ACCESS: false
   ENABLE_VIDEO_BEACON: false
   ENABLE_ONLOAD_BEACON: false
-  ENABLE_EDXNOTES: $EDXAPP_ENABLE_EDXNOTES
+  ENABLE_EDXNOTES: "{{ EDXAPP_ENABLE_EDXNOTES }}"
   
 EDXAPP_BOOK_URL: ""
 # This needs to be set to localhost
@@ -561,7 +561,7 @@ edxapp_environment:
   GEM_PATH: "{{ edxapp_gem_root }}"
   PATH: "{{ edxapp_deploy_path }}"
   # the settings module for edxapp, DJANGO_SETTINGS_MODULE
-  # should be set to ${SERVICE_VARIANT}.${EDXAPP_SETTINGS}
+  # should be set to {{SERVICE_VARIANT}}.{{EDXAPP_SETTINGS}}
   # where SERVICE_VARIANT is lms or cms
   EDX_PLATFORM_SETTINGS: aws
   # Current set to the app dir for json config, this should
@@ -583,7 +583,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
     db: "{{ EDXAPP_MONGO_DB_NAME }}"
     host: "{{ EDXAPP_MONGO_HOSTS }}"
     password: "{{ EDXAPP_MONGO_PASSWORD }}"
-    port: $EDXAPP_MONGO_PORT
+    port: "{{ EDXAPP_MONGO_PORT }}"
     user: "{{ EDXAPP_MONGO_USER }}"
     collection:  'modulestore'
   CONTENTSTORE:
@@ -596,7 +596,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
       db: "{{ EDXAPP_MONGO_DB_NAME }}"
       host: "{{ EDXAPP_MONGO_HOSTS }}"
       password: "{{ EDXAPP_MONGO_PASSWORD }}"
-      port: $EDXAPP_MONGO_PORT
+      port: "{{ EDXAPP_MONGO_PORT }}"
       user: "{{ EDXAPP_MONGO_USER }}"
     ADDITIONAL_OPTIONS: "{{ EDXAPP_CONTENTSTORE_ADDITIONAL_OPTS }}"
     DOC_STORE_CONFIG: *edxapp_generic_default_docstore
@@ -661,7 +661,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   GOOGLE_ANALYTICS_ACCOUNT: "{{ EDXAPP_GOOGLE_ANALYTICS_ACCOUNT }}"
   THIRD_PARTY_AUTH: "{{ EDXAPP_THIRD_PARTY_AUTH }}"
   AWS_STORAGE_BUCKET_NAME: "{{ EDXAPP_AWS_STORAGE_BUCKET_NAME }}"
-  DJFS: $EDXAPP_DJFS
+  DJFS: "{{ EDXAPP_DJFS }}"
 
 generic_cache_config: &default_generic_cache
   BACKEND:  'django.core.cache.backends.memcached.MemcachedCache'
@@ -671,9 +671,9 @@ generic_cache_config: &default_generic_cache
 
 generic_env_config:  &edxapp_generic_env
   ECOMMERCE_API_URL: "{{ EDXAPP_ECOMMERCE_API_URL }}"
-  ONLOAD_BEACON_SAMPLE_RATE: $EDXAPP_ONLOAD_BEACON_SAMPLE_RATE
+  ONLOAD_BEACON_SAMPLE_RATE: "{{ EDXAPP_ONLOAD_BEACON_SAMPLE_RATE }}"
   CORS_ORIGIN_WHITELIST: "{{ EDXAPP_CORS_ORIGIN_WHITELIST }}"
-  CORS_ORIGIN_ALLOW_ALL: $EDXAPP_CORS_ORIGIN_ALLOW_ALL
+  CORS_ORIGIN_ALLOW_ALL: "{{ EDXAPP_CORS_ORIGIN_ALLOW_ALL }}"
   CROSS_DOMAIN_CSRF_COOKIE_DOMAIN: "{{ EDXAPP_CROSS_DOMAIN_CSRF_COOKIE_DOMAIN }}"
   CROSS_DOMAIN_CSRF_COOKIE_NAME: "{{ EDXAPP_CROSS_DOMAIN_CSRF_COOKIE_NAME }}"
   VIDEO_UPLOAD_PIPELINE: "{{ EDXAPP_VIDEO_UPLOAD_PIPELINE }}"
@@ -687,9 +687,9 @@ generic_env_config:  &edxapp_generic_env
   PAYMENT_SUPPORT_EMAIL: "{{ EDXAPP_PAYMENT_SUPPORT_EMAIL }}"
   ZENDESK_URL: "{{ EDXAPP_ZENDESK_URL }}"
   COURSES_WITH_UNSAFE_CODE: "{{ EDXAPP_COURSES_WITH_UNSAFE_CODE }}"
-  BULK_EMAIL_EMAILS_PER_TASK: $EDXAPP_BULK_EMAIL_EMAILS_PER_TASK
+  BULK_EMAIL_EMAILS_PER_TASK: "{{ EDXAPP_BULK_EMAIL_EMAILS_PER_TASK }}"
   MICROSITE_ROOT_DIR: "{{ EDXAPP_MICROSITE_ROOT_DIR }}"
-  MICROSITE_CONFIGURATION: $EDXAPP_MICROSITE_CONFIGURATION
+  MICROSITE_CONFIGURATION: "{{ EDXAPP_MICROSITE_CONFIGURATION }}"
   GRADES_DOWNLOAD:
     STORAGE_TYPE: "{{ EDXAPP_GRADE_STORAGE_TYPE }}"
     BUCKET: "{{ EDXAPP_GRADE_BUCKET }}"
@@ -707,8 +707,8 @@ generic_env_config:  &edxapp_generic_env
   # default email backed set to local SMTP
   EMAIL_BACKEND: "{{ EDXAPP_EMAIL_BACKEND }}"
   EMAIL_HOST: "{{ EDXAPP_EMAIL_HOST }}"
-  EMAIL_PORT: $EDXAPP_EMAIL_PORT
-  EMAIL_USE_TLS: $EDXAPP_EMAIL_USE_TLS
+  EMAIL_PORT: "{{ EDXAPP_EMAIL_PORT }}"
+  EMAIL_USE_TLS: "{{ EDXAPP_EMAIL_USE_TLS }}"
   FEATURES: "{{ EDXAPP_FEATURES }}"
   TENDER_DOMAIN: "{{ EDXAPP_TENDER_DOMAIN }}"
   TENDER_SUBDOMAIN: "{{ EDXAPP_TENDER_SUBDOMAIN }}"
@@ -757,8 +757,8 @@ generic_env_config:  &edxapp_generic_env
   SESSION_COOKIE_DOMAIN:  "{{ EDXAPP_SESSION_COOKIE_DOMAIN }}"
   SESSION_COOKIE_NAME:  "{{ EDXAPP_SESSION_COOKIE_NAME }}"
   COMMENTS_SERVICE_KEY: "{{ EDXAPP_COMMENTS_SERVICE_KEY }}"
-  SEGMENT_IO_LMS: $EDXAPP_SEGMENT_IO_LMS
-  SEGMENT_IO: $EDXAPP_SEGMENT_IO
+  SEGMENT_IO_LMS: "{{ EDXAPP_SEGMENT_IO_LMS }}"
+  SEGMENT_IO: "{{ EDXAPP_SEGMENT_IO }}"
   THEME_NAME: "{{ edxapp_theme_name }}"
   TECH_SUPPORT_EMAIL: "{{ EDXAPP_TECH_SUPPORT_EMAIL }}"
   CONTACT_EMAIL: "{{ EDXAPP_CONTACT_EMAIL }}"
@@ -767,7 +767,7 @@ generic_env_config:  &edxapp_generic_env
   DEFAULT_FEEDBACK_EMAIL: "{{ EDXAPP_DEFAULT_FEEDBACK_EMAIL }}"
   SERVER_EMAIL: "{{ EDXAPP_DEFAULT_SERVER_EMAIL }}"
   BULK_EMAIL_DEFAULT_FROM_EMAIL: "{{ EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL }}"
-  BULK_EMAIL_LOG_SENT_EMAILS: $EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS
+  BULK_EMAIL_LOG_SENT_EMAILS: "{{ EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS }}"
   CAS_SERVER_URL: "{{ EDXAPP_CAS_SERVER_URL }}"
   CAS_EXTRA_LOGIN_PARAMS: "{{ EDXAPP_CAS_EXTRA_LOGIN_PARAMS }}"
   CAS_ATTRIBUTE_CALLBACK: "{{ EDXAPP_CAS_ATTRIBUTE_CALLBACK }}"
@@ -803,8 +803,8 @@ lms_auth_config:
 
 lms_env_config:
   <<: *edxapp_generic_env
-  OAUTH_ENFORCE_SECURE: $EDXAPP_OAUTH_ENFORCE_SECURE
-  PAID_COURSE_REGISTRATION_CURRENCY: $EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY
+  OAUTH_ENFORCE_SECURE: "{{ EDXAPP_OAUTH_ENFORCE_SECURE }}"
+  PAID_COURSE_REGISTRATION_CURRENCY: "{{ EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY }}"
   GIT_REPO_DIR: "{{ EDXAPP_GIT_REPO_DIR }}"
   SITE_NAME:  "{{ EDXAPP_LMS_SITE_NAME }}"
   VIDEO_CDN_URL: "{{ EDXAPP_VIDEO_CDN_URLS }}"
@@ -822,8 +822,8 @@ lms_env_config:
   PDF_RECEIPT_COBRAND_LOGO_PATH: "{{ EDXAPP_PDF_RECEIPT_COBRAND_LOGO_PATH }}"
   PDF_RECEIPT_LOGO_PATH: "{{ EDXAPP_PDF_RECEIPT_LOGO_PATH }}"
   PROFILE_IMAGE_BACKEND: "{{ EDXAPP_PROFILE_IMAGE_BACKEND }}"
-  PROFILE_IMAGE_MIN_BYTES: $EDXAPP_PROFILE_IMAGE_MIN_BYTES
-  PROFILE_IMAGE_MAX_BYTES: $EDXAPP_PROFILE_IMAGE_MAX_BYTES
+  PROFILE_IMAGE_MIN_BYTES: "{{ EDXAPP_PROFILE_IMAGE_MIN_BYTES }}"
+  PROFILE_IMAGE_MAX_BYTES: "{{ EDXAPP_PROFILE_IMAGE_MAX_BYTES }}"
 
 cms_auth_config:
   <<: *edxapp_generic_auth

playbooks/roles/insights/defaults/main.yml

@@ -79,7 +79,7 @@ INSIGHTS_CONFIG:
   SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ INSIGHTS_OAUTH2_URL_ROOT }}'
   # This value should be the same as SOCIAL_AUTH_EDX_OIDC_SECRET
   SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY: '{{ INSIGHTS_OAUTH2_SECRET }}'
-  ENABLE_AUTO_AUTH: $INSIGHTS_ENABLE_AUTO_AUTH
+  ENABLE_AUTO_AUTH: '{{ INSIGHTS_ENABLE_AUTO_AUTH }}'
   PLATFORM_NAME: '{{ INSIGHTS_PLATFORM_NAME }}'
   APPLICATION_NAME: '{{ INSIGHTS_APPLICATION_NAME }}'
   CACHES:
@@ -93,7 +93,7 @@ INSIGHTS_CONFIG:
   EMAIL_HOST: '{{ INSIGHTS_EMAIL_HOST }}'
   EMAIL_HOST_PASSWORD: '{{ INSIGHTS_EMAIL_HOST_PASSWORD }}'
   EMAIL_HOST_USER: '{{ INSIGHTS_EMAIL_HOST_USER }}'
-  EMAIL_PORT: $INSIGHTS_EMAIL_PORT
+  EMAIL_PORT: '{{ INSIGHTS_EMAIL_PORT }}'
   # static file config
   STATICFILES_DIRS: ["{{ insights_static_path }}"]
   STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ insights_service_name }}/staticfiles"

playbooks/roles/xqueue/defaults/main.yml

@@ -57,7 +57,7 @@ xqueue_gunicorn_host: 127.0.0.1
 
 xqueue_env_config:
   XQUEUES: "{{ XQUEUE_QUEUES }}"
-  XQUEUE_WORKERS_PER_QUEUE: $XQUEUE_WORKERS_PER_QUEUE
+  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"

requirements.txt

-ansible==1.5.5
+git+https://github.com/edx/ansible.git@stable-1.9-plus-edx#egg=ansible==1.9.1-edx
 PyYAML==3.11
 Jinja2==2.7.3
 MarkupSafe==0.23