external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 03:32:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #26 from iiab/master

Browse source 
sync from iiab/iiab
This commit is contained in:
A Holt 2017-11-08 18:52:54 -05:00 committed by GitHub
commit 2d754eb62b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
roles/kalite/tasks/install.yml
View file

@ -10,34 +10,32 @@
get_url: url={{ kalite_requirements }} dest={{ pip_packages_dir }}/kalite.txt get_url: url={{ kalite_requirements }} dest={{ pip_packages_dir }}/kalite.txt
when: internet_available when: internet_available
- name: Install KA Lite dependencies with pip (debuntu) #- name: Install KA Lite non-static + reqs file with pip - (debuntu)
pip: requirements={{ pip_packages_dir }}/kalite.txt # pip: requirements={{ pip_packages_dir }}/kalite.txt
virtualenv={{ kalite_venv }} # virtualenv={{ kalite_venv }}
virtualenv_site_packages=no # virtualenv_site_packages=no
extra_args="--no-cache-dir"
# extra_args="--no-cache-dir" # extra_args="--no-cache-dir"
# extra_args="--disable-pip-version-check" # 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 pip: name=ka-lite-static
version={{ kalite_version }} version={{ kalite_version }}
virtualenv={{ kalite_venv }} virtualenv={{ kalite_venv }}
virtualenv_site_packages=no virtualenv_site_packages=no
extra_args="--no-cache-dir" extra_args="--no-cache-dir"
# extra_args="--no-cache-dir"
# extra_args="--disable-pip-version-check" # extra_args="--disable-pip-version-check"
when: internet_available and is_debuntu when: internet_available and is_debuntu
- name: Install KA Lite dependencies with pip (debuntu) #- name: Install KA Lite non-static + reqs file with pip - (OS's other than debuntu)
pip: requirements={{ pip_packages_dir }}/kalite.txt # pip: requirements={{ pip_packages_dir }}/kalite.txt
virtualenv={{ kalite_venv }} # virtualenv={{ kalite_venv }}
virtualenv_site_packages=no # virtualenv_site_packages=no
# extra_args="--no-cache-dir" # extra_args="--no-cache-dir"
# extra_args="--disable-pip-version-check" # 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 pip: name=ka-lite-static
version={{ kalite_version }} version={{ kalite_version }}
virtualenv={{ kalite_venv }} virtualenv={{ kalite_venv }}

8
scripts/ansible
View file

@ -9,9 +9,9 @@ URL="NA"
if [ $(which ansible-playbook) ]; then if [ $(which ansible-playbook) ]; then
VER=`ansible --version|head -n 1|cut -f 2 -d " "` VER=`ansible --version|head -n 1|cut -f 2 -d " "`
GOOD_VER=`echo $VER | grep ^2.4` 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 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 pip install --upgrade ansible==2.4.1 --disable-pip-version-check
exit 0 exit 0
fi fi
@ -99,12 +99,12 @@ fi
### start ansible pip install TODO add venv location /opt/iiab/anisble ### start ansible pip install TODO add venv location /opt/iiab/anisble
if [ $FAMILY = "olpc" ]; then 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 " "` VER=`ansible --version|head -n 1|cut -f 2 -d " "`
echo "ansible version installed via pip $VER" echo "ansible version installed via pip $VER"
fi 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 # unsure if install above will upgrade or skip - cover that now
if [ $FAMILY = "debian" ]; then if [ $FAMILY = "debian" ]; then
if [ ! $VER == "" ]; then if [ ! $VER == "" ]; then