changing hashses to underscores for variable namespace isolation

playbooks/edx_sandbox.yml

@@ -27,6 +27,5 @@
   roles:
     - common
     - nginx
-    - gunicorn
     - edxlocal
     - edxapp

playbooks/roles/xqueue/handlers/main.yml

@@ -15,20 +15,20 @@
 
 # Install the python pre requirements into {{ venv_dir }}
 - name : install python pre-requirements
-  pip: requirements="{{xqueue.pre_requirements_file}}" virtualenv="{{venv_dir}}" state=present
+  pip: requirements="{{xqueue_pre_requirements_file}}" virtualenv="{{venv_dir}}" state=present
   tags:
   - xqueue
   - deploy
 
 # Install the python post requirements into {{ venv_dir }}
 - name : install python post-requirements
-  pip: requirements="{{xqueue.post_requirements_file}}" virtualenv="{{venv_dir}}" state=present
+  pip: requirements="{{xqueue_post_requirements_file}}" virtualenv="{{venv_dir}}" state=present
   tags:
   - xqueue
   - deploy
 
 - name: syncdb and migrate
-  shell: sudo -u www-data /opt/edx/bin/django-admin.py syncdb --migrate --noinput --settings=xqueue.aws_settings --pythonpath=/opt/wwc/xqueue
+  shell: sudo -u www-data /opt/edx/bin/django-admin.py syncdb --migrate --noinput --settings=xqueue_aws_settings --pythonpath=/opt/wwc/xqueue
   when: migrate_db is defined
   tags:
   - xqueue

playbooks/roles/xqueue/tasks/deploy.yml

@@ -7,7 +7,7 @@
 
 # Do A Checkout
 - name: git checkout xqueue repo into $app_base_dir
-  git: dest={{xqueue_code_dir}} repo={{xqueue.source_repo}} version={{xqueue.version}}
+  git: dest={{xqueue_code_dir}} repo={{xqueue_source_repo}} version={{xqueue_version}}
   tags:
   - xqueue
   - deploy

playbooks/roles/xqueue/tasks/main.yml

@@ -16,23 +16,23 @@
 
 - name: install a bunch of system packages on which LMS and CMS rely
   apt: pkg={{item}} state=present
-  with_items: xqueue.debian_pkgs
+  with_items: xqueue_debian_pkgs
   tags:
   - xqueue
 
 - name: create xqueue application config
-  template: src=xqueue.env.json.j2 dest=$app_base_dir/env.json mode=640 owner=www-data group=adm
+  template: src=xqueue_env.json.j2 dest=$app_base_dir/env.json mode=640 owner=www-data group=adm
   tags:
   - xqueue
 
 - name: create xqueue auth file
-  template: src=xqueue.auth.json.j2 dest=$app_base_dir/auth.json mode=640 owner=www-data group=adm
+  template: src=xqueue_auth.json.j2 dest=$app_base_dir/auth.json mode=640 owner=www-data group=adm
   tags:
   - xqueue
 
 - name: creating xqueue upstart script
   sudo: True
-  template: src=xqueue.conf.j2 dest=/etc/init/xqueue.conf owner=root group=root
+  template: src=xqueue_conf.j2 dest=/etc/init/xqueue_conf owner=root group=root
   tags:
   - xqueue
 

playbooks/roles/xqueue/templates/xqueue.auth.json.j2

-{{ xqueue.auth_config | to_nice_json }}
+{{ xqueue_auth_config | to_nice_json }}

playbooks/roles/xqueue/templates/xqueue.conf.j2

-#/etc/init/xqueue.conf
+#/etc/init/xqueue_conf
 
 description "xqueue server"
 author "edX <info@edx.org>"
@@ -6,15 +6,15 @@ author "edX <info@edx.org>"
 respawn
 respawn limit 3 30
 
-env PID=/var/tmp/xqueue.pid
+env PID=/var/tmp/xqueue_pid
 env WORKERS={{ ansible_processor_cores * 2 }}
-env PORT={{ xqueue.gunicorn_port }}
+env PORT={{ xqueue_gunicorn_port }}
 env LANG=en_US.UTF-8
-env DJANGO_SETTINGS_MODULE=xqueue.aws_settings
+env DJANGO_SETTINGS_MODULE=xqueue_aws_settings
 env SERVICE_VARIANT="xqueue"
 
 
 chdir {{ xqueue_code_dir }}
 setuid www-data
 
-exec {{ venv_dir }}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue.wsgi
+exec {{ venv_dir }}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue_wsgi

playbooks/roles/xqueue/templates/xqueue.env.json.j2

-{{ xqueue.env_config | to_nice_json }}
+{{ xqueue_env_config | to_nice_json }}

playbooks/roles/xqueue/vars/main.yml

@@ -3,96 +3,95 @@
 ---
 xqueue_code_dir: "{{ app_base_dir }}/xqueue"
 
-xqueue:
-  # Default nginx listen port
-  # These should be overrided if you want
-  # to serve all content on port 80
-  code_dir: "{{ app_base_dir }}/xqueue"
-  nginx_port: 18040
-  gunicorn_port: 8040
+# Default nginx listen port
+# These should be overrided if you want
+# to serve all content on port 80
+xqueue_code_dir: "{{ app_base_dir }}/xqueue"
+xqueue_nginx_port: 18040
+xqueue_gunicorn_port: 8040
 
 
-  auth_config: {}
-  env_config: {}
+xqueue_auth_config: {}
+xqueue_env_config: {}
 
-  source_repo: https://github.com/edx/xqueue.git
-  version: 'HEAD'
-  pre_requirements_file:    "{{ xqueue_code_dir }}/pre-requirements.txt"
-  post_requirements_file:   "{{ xqueue_code_dir }}/requirements.txt"
+xqueue_source_repo: https://github.com/edx/xqueue_git
+xqueue_version: 'HEAD'
+xqueue_pre_requirements_file:    "{{ xqueue_code_dir }}/pre-requirements.txt"
+xqueue_post_requirements_file:   "{{ xqueue_code_dir }}/requirements.txt"
 
 
-  # These packages are required for the xqueue server,
-  # copied from the LMS role for now since there is a lot
-  # of overlap
-  debian_pkgs:
-    - apparmor-utils
-    - aspell
-    - build-essential
-    - curl
-    - dvipng
-    - fabric
-    - facter
-    - g++
-    - gcc
-    - gfortran
-    - ghostscript
-    - git
-    - github-cli
-    - graphviz
-    - graphviz-dev
-    - gunicorn
-    - inoticoming
-    - ipython
-    - libcrypt-ssleay-perl
-    - libcurl4-openssl-dev
-    - libdigest-sha-perl
-    - libfreetype6-dev
-    - libgeos-dev
-    - libgraphviz-dev
-    - libjpeg8-dev
-    - liblapack-dev
-    - liblwp-protocol-https-perl
-    - libmysqlclient-dev
-    - libnet-amazon-ec2-perl
-    - libpng12-dev
-    - libreadline-dev
-    - libreadline6-dev
-    - libssl-dev
-    - libswitch-perl
-    - libwww-perl
-    - libxml++2.6-dev
-    - libxml2-dev
-    - libxml2-utils
-    - libxslt1-dev
-    - maven2
-    - mongodb
-    - mongodb-clients
-    - mysql-client
-    - npm
-    - ntp
-    - openjdk-7-jdk
-    - openjdk-7-jre
-    - pep8
-    - perl
-    - pkg-config
-    - postfix
-    - pylint
-    - python-boto
-    - python-coverage-test-runner
-    - python-django-nose
-    - python-jenkins
-    - python-nose
-    - python-nosexcover
-    - python-numpy
-    - python-pip
-    - python-scipy
-    - rake
-    - reprepro
-    - rsyslog
-    - rubygems
-    - sqlite3
-    - super
-    - vagrant
-    - yui-compressor
-    - zip
-    - zlib1g-dev
+# These packages are required for the xqueue server,
+# copied from the LMS role for now since there is a lot
+# of overlap
+xqueue_debian_pkgs:
+  - apparmor-utils
+  - aspell
+  - build-essential
+  - curl
+  - dvipng
+  - fabric
+  - facter
+  - g++
+  - gcc
+  - gfortran
+  - ghostscript
+  - git
+  - github-cli
+  - graphviz
+  - graphviz-dev
+  - gunicorn
+  - inoticoming
+  - ipython
+  - libcrypt-ssleay-perl
+  - libcurl4-openssl-dev
+  - libdigest-sha-perl
+  - libfreetype6-dev
+  - libgeos-dev
+  - libgraphviz-dev
+  - libjpeg8-dev
+  - liblapack-dev
+  - liblwp-protocol-https-perl
+  - libmysqlclient-dev
+  - libnet-amazon-ec2-perl
+  - libpng12-dev
+  - libreadline-dev
+  - libreadline6-dev
+  - libssl-dev
+  - libswitch-perl
+  - libwww-perl
+  - libxml++2.6-dev
+  - libxml2-dev
+  - libxml2-utils
+  - libxslt1-dev
+  - maven2
+  - mongodb
+  - mongodb-clients
+  - mysql-client
+  - npm
+  - ntp
+  - openjdk-7-jdk
+  - openjdk-7-jre
+  - pep8
+  - perl
+  - pkg-config
+  - postfix
+  - pylint
+  - python-boto
+  - python-coverage-test-runner
+  - python-django-nose
+  - python-jenkins
+  - python-nose
+  - python-nosexcover
+  - python-numpy
+  - python-pip
+  - python-scipy
+  - rake
+  - reprepro
+  - rsyslog
+  - rubygems
+  - sqlite3
+  - super
+  - vagrant
+  - yui-compressor
+  - zip
+  - zlib1g-dev