Merge pull request #175 from edx/feanil/default_app_ports

Extract the app port numbers into the vars file.

playbooks/roles/edxapp/templates/cms.conf.j2

@@ -16,7 +16,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.cms }}
 {% else %}
 env WORKERS={{ worker_core_mult.cms }}
 {% endif %}
-env PORT=8010
+env PORT={{edxapp_cms_app_port}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=cms.envs.aws
 env SERVICE_VARIANT="cms"

playbooks/roles/edxapp/templates/lms-preview.conf.j2

@@ -17,7 +17,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.lms_preview }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms_preview }}
 {% endif %}
-env PORT=8020
+env PORT={{edxapp_lms_preview_app_port}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws
 env SERVICE_VARIANT="lms-preview"

playbooks/roles/edxapp/templates/lms-xml.conf.j2

@@ -16,7 +16,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.lms_xml }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms_xml }}
 {% endif %}
-env PORT=8030
+env PORT={{edxapp_lms_xml_app_port}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws
 env SERVICE_VARIANT="lms-xml"

playbooks/roles/edxapp/templates/lms.conf.j2

@@ -14,7 +14,7 @@ env WORKERS={{ ansible_processor|length * worker_core_mult.lms }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms }}
 {% endif %}
-env PORT=8000
+env PORT={{edxapp_lms_app_port}}
 env LANG=en_US.UTF-8
 env DJANGO_SETTINGS_MODULE=lms.envs.aws
 env SERVICE_VARIANT="lms"

playbooks/roles/edxapp/vars/main.yml

@@ -163,6 +163,11 @@ lms_nginx_port: 80
 lms_preview_nginx_port: 18020
 cms_nginx_port: 18010
 
+edxapp_cms_app_port: 8010
+edxapp_lms_app_port: 8010
+edxapp_lms_xml_app_port: 8010
+edxapp_lms_preview_app_port: 8010
+
 # These vars are for creating the application json config
 # files.  There are two for each service that uses the
 # 'edx-platform' code.  Defining them will create the upstart