Commit b4da5e24 by John Jarvis

Merge pull request #929 from edx/jarv/release-fixes

Jarv/release fixes
parents 0ba07131 ba1feb18
...@@ -3,12 +3,15 @@ ...@@ -3,12 +3,15 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- certs - certs
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,11 +3,14 @@ ...@@ -3,11 +3,14 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- common - common
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,11 +3,14 @@ ...@@ -3,11 +3,14 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- demo - demo
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- role: nginx - role: nginx
...@@ -12,6 +13,8 @@ ...@@ -12,6 +13,8 @@
- discern - discern
- discern - discern
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
vars: vars:
migrate_db: "yes" migrate_db: "yes"
openid_workaround: True openid_workaround: True
ENABLE_DATADOG: True
ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- role: nginx - role: nginx
...@@ -33,3 +36,9 @@ ...@@ -33,3 +36,9 @@
- discern - discern
- certs - certs
- edx_ansible - edx_ansible
- role: datadog
when: ENABLE_DATADOG
- role: splunkforwarder
when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- role: nginx - role: nginx
...@@ -15,6 +16,8 @@ ...@@ -15,6 +16,8 @@
- lms - lms
- edxapp - edxapp
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
enable_newrelic: True ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- role: nginx - role: nginx
...@@ -13,8 +13,10 @@ ...@@ -13,8 +13,10 @@
- forum - forum
- forum - forum
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic - role: newrelic
when: enable_newrelic when: ENABLE_NEWRELIC
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,13 +3,16 @@ ...@@ -3,13 +3,16 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- role: edxapp - role: edxapp
celery_worker: True celery_worker: True
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- role: nginx - role: nginx
...@@ -12,6 +13,8 @@ ...@@ -12,6 +13,8 @@
- xqueue - xqueue
- role: xqueue - role: xqueue
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
sudo: True sudo: True
gather_facts: True gather_facts: True
vars: vars:
enable_datadog: True ENABLE_DATADOG: False
enable_splunkforwarder: True ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- aws - aws
- role: nginx - role: nginx
...@@ -12,6 +13,8 @@ ...@@ -12,6 +13,8 @@
- xserver - xserver
- role: xserver - role: xserver
- role: datadog - role: datadog
when: enable_datadog when: ENABLE_DATADOG
- role: splunkforwarder - role: splunkforwarder
when: enable_splunkforwarder when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
openid_workaround: True openid_workaround: True
EDXAPP_LMS_NGINX_PORT: '80' EDXAPP_LMS_NGINX_PORT: '80'
edx_platform_version: 'master' edx_platform_version: 'master'
# These should stay false for the public AMI
ENABLE_DATADOG: False
ENABLE_SPLUNKFORWARDER: False
ENABLE_NEWRELIC: False
roles: roles:
- role: nginx - role: nginx
nginx_sites: nginx_sites:
...@@ -36,3 +40,9 @@ ...@@ -36,3 +40,9 @@
- ora - ora
- discern - discern
- edx_ansible - edx_ansible
- role: datadog
when: ENABLE_DATADOG
- role: splunkforwarder
when: ENABLE_SPLUNKFORWARDER
- role: newrelic
when: ENABLE_NEWRELIC
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