variable naming

playbooks/roles/discern/defaults/main.yml

-DISCERN_NGINX_PORT: 80
+DISCERN_NGINX_PORT: 18070
 
 discern_source_repo: https://github.com/edx/discern.git
 ease_source_repo: https://github.com/edx/ease.git
@@ -8,6 +8,6 @@ discern_settings: discern.aws
 nltk_data_dir: /usr/share/nltk_data
 ease_branch: master
 discern_branch: dev
-gunicorn_port: 7999
+discern_gunicorn_port: 8070
 discern_user: discern
 site_name: discern

playbooks/roles/nginx/templates/cms.j2

 upstream cms-backend {
     # For a TCP configuration:
-    server 127.0.0.1:{{ edxapp_cms_app_port }} fail_timeout=0;
+    server 127.0.0.1:{{ edxapp_cms_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/lms-preview.j2

 upstream lms-preview-backend {
     # For a TCP configuration:
-    server 127.0.0.1:{{ edxapp_lms_preview_app_port }} fail_timeout=0;
+    server 127.0.0.1:{{ edxapp_lms_preview_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/lms.j2

 upstream lms-backend {
     # For a TCP configuration:
-    server 127.0.0.1:{{ edxapp_lms_app_port }} fail_timeout=0;
+    server 127.0.0.1:{{ edxapp_lms_gunicorn_port }} fail_timeout=0;
 }
 
 server {

playbooks/roles/nginx/templates/xserver.j2

@@ -10,11 +10,11 @@
 ##
 upstream xserver_app_server {
     # For a TCP configuration:
-    server 127.0.0.1:{{ xserver_port }} fail_timeout=0;
+    server 127.0.0.1:{{ xserver_gunicorn_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/ora/defaults/main.yml

 # vars for the ORA role
 ---
-ORA_NGINX_PORT: 18091
+ORA_NGINX_PORT: 18060
 
 ora_code_dir: "{{ app_base_dir }}/edx-ora"
 # Default nginx listen port
@@ -11,7 +11,7 @@ ora_user_home: "/opt/edx-ora"
 ora_venv_dir: "{{ ora_user_home }}/virtualenvs/{{ ora_user }}"
 ease_venv_dir: "{{ ora_venv_dir }}"
 ora_gunicorn_workers: 4
-ora_gunicorn_port: 8091
+ora_gunicorn_port: 8060
 
 # ora_env_config and ora_auth_config
 # should be overridden for your

playbooks/roles/xserver/defaults/main.yml

 # Variables for the xserver.
 ---
 
+XSERVER_NGINX_PORT: 18050
 RABBIT_RUN_URL: ''
 RABBIT_GRADER_ROOT: ''
 RABBIT_LOGGING_ENV: 'sandbox'
@@ -34,8 +35,7 @@ xserver_sandbox_venv_dir: "{{ venv_dir }}_apparmor_sandbox"
 
 xserver_requirements_file: "{{ xserver_code_dir }}/requirements.txt"
 
-xserver_port: 8050
-xserver_nginx_port: 18050
+xserver_gunicorn_port: 8050
 
 xserver_debian_pkgs:
   - build-essential

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

@@ -13,7 +13,7 @@ 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={{ ansible_processor|length }}
-env PORT={{ xserver_port }}
+env PORT={{ xserver_gunicor_port }}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=xserver_aws_settings
 env SERVICE_VARIANT="xserver"