Merge pull request #888 from tim-moody/r-6.2-kalite-17

upgrade kalite to 0.17
XSCE · Mar 1, 2017 · 3ce9adc · 3ce9adc
2 parents f6f9df4 + fd1dc43
commit 3ce9adc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 29 deletions.
diff --git a/roles/kalite/defaults/main.yml b/roles/kalite/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 # The values here are defaults.
 # To override them edit the main var definitions in xsce/vars
-kalite_version: "0.16"
+kalite_version: "0.17"
 kalite_repo_url: "https://github.com/learningequality/ka-lite.git"
 kalite_root: "/library/ka-lite"
 kalite_user: kalite

diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml
@@ -9,15 +9,15 @@
     - download
   when: not {{ use_cache }} and not {{ no_network }} and ansible_distribution == "CentOS"
 
-# Version 0.16.x
-# pip show kalite 
-# Requires: docopt, South, django-js-reverse, ply, slimit, six, django-appconf, 
+# Version 0.17.x
+# pip show kalite
+# Requires: docopt, South, django-js-reverse, ply, slimit, six, django-appconf,
 # peewee, python-dateutil, django-dbbackup
 
 # from /usr/lib/python2.7/site-packages/ka_lite-0.16.0-py2.7.egg-info/requires.txt
 # docopt>=0.6,<0.7
 # South==0.8.4
-# django-js-reverse==0.5.0 ## no rpm 
+# django-js-reverse==0.5.0 ## no rpm
 # ply==3.4
 # slimit==0.8.1
 # six==1.9.0
@@ -27,27 +27,16 @@
 # django-dbbackup==2.3.2   ## no rpm
 
 - name: Downoad kalite with pip
-  pip: name=ka-lite version={{ kalite_version }}       
+  pip: name=ka-lite version={{ kalite_version }}
        extra_args="--download {{ pip_packages_dir }}"
   when: not {{ use_cache }} and not {{ no_network }}
   tags:
     - download2
 
-- name: Download khan assessments
-  shell: wget {{ khan_assessment_url }} -c -P{{ downloads_dir }}
-  async: 2000
-  tags:
-    - download2
-
-- name: wait until the file becomes available
-  wait_for: path={{ downloads_dir }}/khan_assessment.zip
-            state=present
-            timeout=2000
-
 - name: Install kalite with pip
-  pip: name=ka-lite version=0.16
+  pip: name=ka-lite version={{ kalite_version }}
        extra_args="--no-index --find-links=file://{{ pip_packages_dir }}"
-  
+
 - name: Default is to have cronserve started with kalite
   set_fact:
      job_scheduler_stanza: ""

diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml
@@ -1,3 +1,5 @@
+# Assessment logic removed 3/1/2017 TFM
+
 # Assume all XOs are F18 and nothing else is
 
 - name: Calc kalite db file name F18
@@ -41,15 +43,12 @@
 
 - include: setup-f18.yml
   when: not kalite_installed.stat.exists and is_F18
- 
+
 - include: setup.yml
   when: not kalite_installed.stat.exists and not is_F18
 
-- include: assessment.yml
-  when: not is_F18
-
 - include: enable.yml
-   
+
 - name: Add kalite to service list
   ini_file: dest='{{ service_filelist }}'
             section=kalite

diff --git a/roles/kalite/tasks/setup.yml b/roles/kalite/tasks/setup.yml
@@ -18,8 +18,3 @@
      KALITE_HOME: "{{ kalite_root }}"
   async: 900
   poll: 10
-
-- name: Kluge to get kalite docs in 0.16.x
-  command: pip install -U --force-reinstall ka-lite
-           creates=/usr/share/kalite/docs/_build/html/installguide/install_all.html
-