Merge pull request #168 from edx/feanil/remove_facter

Use ansible facts instead of facter.

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

@@ -11,10 +11,8 @@ respawn limit 3 30
 env PID=/var/tmp/cms.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-{% if facter_processorcount|int(default="NaN") is number  %}
-env WORKERS={{ worker_core_mult.cms * facter_processorcount|int }}
-{% elif ansible_processor_cores|int(default="NaN") is number %}
-env WORKERS={{ worker_core_mult.cms * ansible_processor_cores|int }}
+{% if ansible_processor|length > 0 %}
+env WORKERS={{ ansible_processor|length }}
 {% else %}
 env WORKERS={{ worker_core_mult.cms }}
 {% endif %}

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

@@ -12,10 +12,8 @@ respawn limit 3 30
 env PID=/var/tmp/lms.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-{% if facter_processorcount|int(default="NaN") is number  %}
-env WORKERS={{ worker_core_mult.lms_preview * facter_processorcount|int }}
-{% elif ansible_processor_cores|int(default="NaN") is number %}
-env WORKERS={{ worker_core_mult.lms_preview * ansible_processor_cores|int }}
+{% if ansible_processor|length > 0 %}
+env WORKERS={{ ansible_processor|length }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms_preview }}
 {% endif %}

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

@@ -11,10 +11,8 @@ respawn limit 3 30
 env PID=/var/tmp/lms-xml.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-{% if facter_processorcount|int(default="NaN") is number %}
-env WORKERS={{ worker_core_mult.lms_xml * facter_processorcount|int  }}
-{% elif ansible_processor_cores|int(default="NaN") is number %}
-env WORKERS={{ worker_core_mult.lms_xml * ansible_processor_cores|int  }}
+{% if ansible_processor|length > 0 %}
+env WORKERS={{ ansible_processor|length }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms_xml }}
 {% endif %}

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

@@ -9,10 +9,8 @@ respawn limit 3 30
 env PID=/var/tmp/lms.pid
 #env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
 #env NEWRELIC={{venv_dir}}/bin/newrelic-admin
-{% if facter_processorcount|int(default="NaN") is number  %}
-env WORKERS={{ worker_core_mult.lms * facter_processorcount|int }}
-{% elif ansible_processor_cores|int(default="NaN") is number %}
-env WORKERS={{ worker_core_mult.lms * ansible_processor_cores|int }}
+{% if ansible_processor|length > 0 %}
+env WORKERS={{ ansible_processor|length }}
 {% else %}
 env WORKERS={{ worker_core_mult.lms }}
 {% endif %}

playbooks/roles/edxapp/vars/main.yml

@@ -208,7 +208,6 @@ lms_debian_pkgs:
   - curl
   - dvipng
   - fabric
-  - facter
   - g++
   - gcc
   - gfortran

playbooks/roles/xqueue/vars/main.yml

@@ -51,7 +51,6 @@ xqueue_debian_pkgs:
   - curl
   - dvipng
   - fabric
-  - facter
   - g++
   - gcc
   - gfortran