diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index c08cc52de..32b6cc5c3 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -10,34 +10,32 @@ get_url: url={{ kalite_requirements }} dest={{ pip_packages_dir }}/kalite.txt when: internet_available -- name: Install KA Lite dependencies with pip (debuntu) - pip: requirements={{ pip_packages_dir }}/kalite.txt - virtualenv={{ kalite_venv }} - virtualenv_site_packages=no - extra_args="--no-cache-dir" +#- name: Install KA Lite non-static + reqs file with pip - (debuntu) +# pip: requirements={{ pip_packages_dir }}/kalite.txt +# virtualenv={{ kalite_venv }} +# virtualenv_site_packages=no # extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" - when: internet_available and is_debuntu +# when: internet_available and is_debuntu -- name: Install KA Lite with pip (debuntu) +- name: Install KA Lite static with pip - (debuntu) pip: name=ka-lite-static version={{ kalite_version }} virtualenv={{ kalite_venv }} virtualenv_site_packages=no extra_args="--no-cache-dir" -# extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" when: internet_available and is_debuntu -- name: Install KA Lite dependencies with pip (debuntu) - pip: requirements={{ pip_packages_dir }}/kalite.txt - virtualenv={{ kalite_venv }} - virtualenv_site_packages=no +#- name: Install KA Lite non-static + reqs file with pip - (OS's other than debuntu) +# pip: requirements={{ pip_packages_dir }}/kalite.txt +# virtualenv={{ kalite_venv }} +# virtualenv_site_packages=no # extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" - when: internet_available and not is_debuntu +# when: internet_available and not is_debuntu -- name: Install KA Lite with pip (OS's other than debuntu) +- name: Install KA Lite static with pip - (OS's other than debuntu) pip: name=ka-lite-static version={{ kalite_version }} virtualenv={{ kalite_venv }} diff --git a/scripts/ansible b/scripts/ansible index 34353fae4..5a6028cc6 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -9,9 +9,9 @@ URL="NA" if [ $(which ansible-playbook) ]; then VER=`ansible --version|head -n 1|cut -f 2 -d " "` GOOD_VER=`echo $VER | grep ^2.4` -# 2.2.0.0 -> 2.4.0 patching was not applied -just upgrade via pip +# 2.2.0.0 -> 2.4.1+ patching was not applied -just upgrade via pip if [ $GOOD_VER = "" ]; then - echo "Ansible $VER installed updating to 2.4.0" + echo "Ansible $VER installed updating to 2.4.1" pip install --upgrade ansible==2.4.1 --disable-pip-version-check exit 0 fi @@ -99,12 +99,12 @@ fi ### start ansible pip install TODO add venv location /opt/iiab/anisble if [ $FAMILY = "olpc" ]; then - pip install ansible==2.4.0 --disable-pip-version-check + pip install ansible==2.4.1 --disable-pip-version-check VER=`ansible --version|head -n 1|cut -f 2 -d " "` echo "ansible version installed via pip $VER" fi -# handle 2.2.1 -> 2.4.0 deb install undo patching +# handle 2.2.1 -> 2.4.1+ deb install undo patching # unsure if install above will upgrade or skip - cover that now if [ $FAMILY = "debian" ]; then if [ ! $VER == "" ]; then