Commit bb6875ed by Bilal

Addressing comments

parent cb53c7b6
...@@ -15,9 +15,12 @@ ...@@ -15,9 +15,12 @@
# vars are namespaced with the module name. # vars are namespaced with the module name.
# #
appneta_role_name: appneta appneta_role_name: appneta
appneta_user: '{{ appneta_role_name }}'
appneta_home: '{{ COMMON_APP_DIR }}/{{ appneta_role_name }}'
appneta_venv_dir: '{{ appneta_home }}/venvs/{{ appneta_role_name }}'
USE_STATIC_CONFIG: false USE_STATIC_CONFIG: false
apt_server: "apt.appneta.com" apt_server: "{{ (USE_STATIC_CONFIG == true) | ternary('apt-static.appneta.com','apt.appneta.com') }}"
config_server: "config.tv.appneta.com" config_server: "{{ (USE_STATIC_CONFIG == true) | ternary('config-static.appneta.com','config.tv.appneta.com') }}"
skip_certs: true skip_certs: true
ACCESS_KEY: "eb3e9f99-f37e-4f66-b87b-cae73313ad9c" ACCESS_KEY: "eb3e9f99-f37e-4f66-b87b-cae73313ad9c"
install_sequencer: true install_sequencer: true
......
---
- name: restart nginx
service: name=nginx state=restarted
...@@ -20,3 +20,10 @@ ...@@ -20,3 +20,10 @@
# } # }
dependencies: dependencies:
- common - common
- role: edx_service
edx_service_name: "{{ appneta_role_name }}"
edx_service_user: "{{ appneta_user }}"
edx_service_home: "{{ appneta_home }}"
edx_service_packages:
debian: "{{ appneta_debian_pkgs }}"
redhat: "{{ appneta_redhat_pkgs }}"
...@@ -38,19 +38,6 @@ ...@@ -38,19 +38,6 @@
create: yes create: yes
when: not USE_STATIC_CONFIG when: not USE_STATIC_CONFIG
- name: set facts according to static config
set_fact:
apt_server: "apt-static.appneta.com"
config_server: "config-static.appneta.com"
when: USE_STATIC_CONFIG
- name: install certificates
apt:
name: ca-certificates
state: latest
force: yes
when: not skip_certs
- name: create appneta sources.list - name: create appneta sources.list
apt_repository: apt_repository:
repo: "{{ appneta_apt_repo }}" repo: "{{ appneta_apt_repo }}"
...@@ -68,9 +55,9 @@ ...@@ -68,9 +55,9 @@
create: yes create: yes
- name: install common library and headers - name: install common library and headers
apt: > apt:
pkg={{ item }} name: "{{ item }}"
force=yes force: yes
with_items: appneta_debian_pkgs with_items: appneta_debian_pkgs
- name: install appneta-sequencer - name: install appneta-sequencer
...@@ -80,42 +67,16 @@ ...@@ -80,42 +67,16 @@
force: yes force: yes
when: install_sequencer when: install_sequencer
- name: Start appneta-sequencer - name: start appneta-sequencer
service: service:
name: appneta-sequencer name: appneta-sequencer
state: started state: started
when: install_sequencer when: install_sequencer
#- name: Install nginx agent - name: install oboe
# apt: pip:
# name: nginx name: oboe
# state: present virtualenv: "{{ appneta_venv_dir }}r"
# virtualenv_command: virtualenv
#- name: Install nginx light and nginx extras state: present
# apt: pkg={{ item }} state=present sudo_user: "{{ appneta_user }}"
# notify: restart nginx
# with_items: nginx_extra_pkgs
#
#- name: Install oboe
# pip:
# name: oboe
# state: present
#
#- name: Add greenlet instrumentation
# pip:
# extra_args: '-i https://pypi.appneta.com'
# name: greenlet
# version: 0.4.5-oboe1
# state: present
#
#- name: Add tornado instrumentation
# pip:
# extra_args: '-i https://pypi.appneta.com'
# name: tornado
# version: 2.3-oboe3
# state: present
#
#- name: Add ruby instrumentaion
# gem:
# name: traceview
# state: present
...@@ -4,6 +4,7 @@ gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html ...@@ -4,6 +4,7 @@ gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
{{ ansible_managed }} {{ ansible_managed }}
""" """
import multiprocessing import multiprocessing
import oboeware.djangoware
preload_app = True preload_app = True
timeout = 300 timeout = 300
......
...@@ -4,6 +4,7 @@ gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html ...@@ -4,6 +4,7 @@ gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
{{ ansible_managed }} {{ ansible_managed }}
""" """
import multiprocessing import multiprocessing
import oboeware.djangoware
preload_app = True preload_app = True
timeout = 300 timeout = 300
......
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