Commit 87454380 by Joe Blaylock

Stanford dosa merge WIP/drop datadog from stage

Another wip commit resolving problems installing the util stack. Also,
remove datadog from staging hosts where it's not needed.
parent e5189d62
--- ---
- hosts: tag_environment_stage:!tag_function_nat - name: Common configuration for all staging hosts
# exclude nat host b/c we can't log in anyway # exclude nat host b/c we can't log in anyway
#- hosts: tag_Name_bastion_stage hosts: tag_environment_stage:!tag_function_nat
sudo: True sudo: True
vars: vars:
secure_dir: ../../../edx-secret/ansible secure_dir: ../../../edx-secret/ansible
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
- "{{ secure_dir }}/vars/edxapp_stage_vars.yml" - "{{ secure_dir }}/vars/edxapp_stage_vars.yml"
- "{{ secure_dir }}/vars/users.yml" - "{{ secure_dir }}/vars/users.yml"
- "{{ secure_dir }}/vars/edxapp_stage_users.yml" - "{{ secure_dir }}/vars/edxapp_stage_users.yml"
- "{{ secure_dir }}/vars/datadog_stage.yml"
roles: roles:
- common - common
- supervisor - supervisor
......
- hosts: tag_Name_jumpbox_stage - name: Set up staging jumpbox
hosts: tag_Name_jumpbox_stage
sudo: True sudo: True
vars_files: vars_files:
- "{{ secure_dir }}/vars/users_jumpbox.yml" - "{{ secure_dir }}/vars/users_jumpbox.yml"
- "{{ secure_dir }}/vars/datadog_stage.yml"
vars: vars:
secure_dir: '../../../configuration-secure/ansible' secure_dir: '../../../configuration-secure/ansible'
local_dir: '../../../configuration-secure/ansible/local' local_dir: '../../../configuration-secure/ansible/local'
roles: roles:
- common - common
- datadog
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
sudo: True sudo: True
vars_files: vars_files:
- "{{ secure_dir }}/vars/users_jumpbox.yml" - "{{ secure_dir }}/vars/users_jumpbox.yml"
- "{{ secure_dir }}/vars/datadog_stage.yml"
vars: vars:
secure_dir: '../../../configuration-secure/ansible' secure_dir: '../../../configuration-secure/ansible'
local_dir: '../../../configuration-secure/ansible/local' local_dir: '../../../configuration-secure/ansible/local'
roles: roles:
- common - common
- datadog
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
vars_files: vars_files:
- "{{ secure_dir }}/vars/ora_stage_vars.yml" - "{{ secure_dir }}/vars/ora_stage_vars.yml"
- "{{ secure_dir }}/vars/edxapp_stage_users.yml" - "{{ secure_dir }}/vars/edxapp_stage_users.yml"
- "{{ secure_dir }}/vars/datadog_stage.yml"
roles: roles:
- common - common
- supervisor - supervisor
...@@ -16,5 +15,4 @@ ...@@ -16,5 +15,4 @@
nginx_sites: nginx_sites:
- ora - ora
- ora - ora
- datadog
#- splunkforwarder #- splunkforwarder
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
# Substitute github mirror in all requirements files # Substitute github mirror in all requirements files
- name: Updating requirement files for git mirror - name: Updating requirement files for git mirror
command: | command: |
/bin/sed -i -e 's/github\.com/{{ GIT_MIRROR }}/g' {{ item }} /bin/sed -i -e 's/github\.com/{{ COMMON_GIT_MIRROR }}/g' {{ item }}
with_items: with_items:
- "{{ base_requirements_file }}" - "{{ base_requirements_file }}"
- "{{ pre_requirements_file }}" - "{{ pre_requirements_file }}"
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
- name: Install sandbox requirements into sandbox venv - name: Install sandbox requirements into sandbox venv
shell: > shell: >
cd {{ edxapp_app_dir }} && cd {{ edxapp_app_dir }} &&
{{ EDXAPP_SANDBOX_VENV_DIR }}/bin/pip install -i {{ PYPI_MIRROR_URL }} --exists-action w --use-mirrors {{ EDXAPP_SANDBOX_VENV_DIR }}/bin/pip install -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w --use-mirrors
--upgrade --no-deps -r {{ item }} --upgrade --no-deps -r {{ item }}
with_items: with_items:
- "{{ sandbox_base_requirements }}" - "{{ sandbox_base_requirements }}"
......
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