Move back to prefix notation for xserver vars.

playbooks/roles/xserver/tasks/deploy.yml

@@ -4,17 +4,19 @@
   - deploy
 
 - name: checkout code
-  git: dest={{ xserver_code_dir }} repo={{ xserver.source_repo }} version={{ xserver_version }}
+  git: dest={{ xserver_code_dir }} repo={{ xserver_source_repo }} version={{ xserver_version }}
   tags:
   - deploy
 
 - name: install requirements
-  pip: requirements="{{ xserver.requirements_file }}" virtualenv="{{ venv_dir }}" state=present
+  pip: requirements="{{ xserver_requirements_file }}" virtualenv="{{ venv_dir }}" state=present
   tags:
   - deploy
 
 - name: install sandbox requirements
-  pip: requirements="{{ xserver.requirements_file }}" virtualenv="{{ xserver.sandbox_venv_dir }}" state=present
+  pip: requirements="{{ xserver_requirements_file }}" virtualenv="{{ xserver_sandbox_venv_dir }}" state=present
+  tags:
+  - deploy
   tags:
   - deploy
 

playbooks/roles/xserver/tasks/main.yml

@@ -8,10 +8,10 @@
   user: name=sandbox group=sandbox
 
 - name: create sandbox python directory
-  file: path={{ xserver.sandbox_venv_dir }} owner=ubuntu group=adm mode=2775 state=directory
+  file: path={{ xserver_sandbox_venv_dir }} owner=ubuntu group=adm mode=2775 state=directory
 
 - name: create sandbox python
-  command: /usr/local/bin/virtualenv {{ xserver.sandbox_venv_dir }} --distribute creates={{ xserver.sandbox_venv_dir }}/bin/activate
+  command: /usr/local/bin/virtualenv {{ xserver_sandbox_venv_dir }} --distribute creates={{ xserver_sandbox_venv_dir }}/bin/activate
 
 - name: set sandbox sudoers settings
   copy: src=sandbox.sudoers dest=/etc/sudoers.d/99-sandbox mode=0440
@@ -39,14 +39,16 @@
   - "usr.bin.python-sandbox.j2"
 
 - name: enforce app-armor rules
-  command: aa-enforce {{ xserver.sandbox_venv_dir }}
+  command: aa-enforce {{ xserver_sandbox_venv_dir }}
 
 - name: setup upstart script
-  template: src=xserver.conf.j2 dest=/etc/init/xserver.conf owner=root group=root
+  template: src=xserver_conf.j2 dest=/etc/init/xserver_conf owner=root group=root
 
 - name: install system dependencies of xserver
   apt: pkg={{ item }} state=present
-  with_items: xserver.debian_pkgs
+  with_items: xserver_debian_pkgs
+  tags:
+  - testit
 
 - include: nginx.yml
 

playbooks/roles/xserver/templates/simple-proxy.j2

@@ -10,11 +10,11 @@
 ##
 upstream app_server {
     # For a TCP configuration:
-    server 127.0.0.1:{{ xserver.port }} fail_timeout=0;
+    server 127.0.0.1:{{ xserver_port }} fail_timeout=0;
 }
 
 server {
-  listen {{ xserver.nginx_port }} default_server;
+  listen {{ xserver_nginx_port }} default_server;
 
   location / {
     try_files $uri @proxy_to_app;

playbooks/roles/xserver/templates/xserver.conf.j2

@@ -13,9 +13,9 @@ env PID=/var/tmp/xserver.pid
 env NEW_RELIC_CONFIG_FILE={{ app_base_dir }}/newrelic.ini
 env NEWRELIC={{ venv_dir }}/bin/newrelic-admin
 env WORKERS=4
-env PORT={{ xserver.port }}
+env PORT={{ xserver_port }}
 env LANG=en_US.UTF-8
-env DJANGO_SETTINGS_MODULE=xserver.aws_settings
+env DJANGO_SETTINGS_MODULE=xserver_aws_settings
 env SERVICE_VARIANT="xserver"
 
 

playbooks/roles/xserver/vars/main.yml

@@ -7,23 +7,22 @@ xserver_code_dir: "{{ app_base_dir }}/xserver"
 # with the default pointing to the head of master.
 xserver_version: HEAD
 
-xserver:
-    source_repo: "git://github.com/edx/xserver.git"
+xserver_source_repo: "git://github.com/edx/xserver.git"
 
-    sandbox_venv_dir: "{{ venv_dir }}_apparmor_sandbox"
+xserver_sandbox_venv_dir: "{{ venv_dir }}_apparmor_sandbox"
 
-    requirements_file: "{{ xserver_code_dir }}/requirements.txt"
+xserver_requirements_file: "{{ xserver_code_dir }}/requirements.txt"
 
-    port: 8050
-    nginx_port: 18050
+xserver_port: 8050
+xserver_nginx_port: 18050
 
-    debian_pkgs:
-      - build-essential
-      - gcc
-      - gfortran
-      - liblapack-dev
-      - libxml++2.6-dev
-      - libxml2-dev
-      - libxml2-utils
-      - libxslt1-dev
-      - python-dev
+xserver_debian_pkgs:
+  - build-essential
+  - gcc
+  - gfortran
+  - liblapack-dev
+  - libxml++2.6-dev
+  - libxml2-dev
+  - libxml2-utils
+  - libxslt1-dev
+  - python-dev