From 6d87652e8c8d4b2ccca77a51d20807f8297d2242 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 18 Oct 2017 19:54:28 -0500 Subject: [PATCH] just dup the code --- roles/kalite/tasks/install.yml | 25 +++++++++++++++++++------ roles/osm/tasks/main.yml | 28 +++++++++++++++++++++------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 4077b7c8a..40169dc8b 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -14,24 +14,37 @@ pip: requirements={{ pip_packages_dir }}/kalite.txt virtualenv={{ kalite_venv }} virtualenv_site_packages=no - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} # extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" - when: internet_available + when: internet_available and is_debuntu - name: Install ka-lite with pip pip: name=ka-lite-static version={{ kalite_version }} virtualenv={{ kalite_venv }} virtualenv_site_packages=no - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} # extra_args="--no-cache-dir" # extra_args="--disable-pip-version-check" - when: internet_available + when: internet_available and is_debuntu + +- name: Install ka-lite dependencies with pip + 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 + +- name: Install ka-lite with pip + pip: name=ka-lite-static + version={{ kalite_version }} + 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 - name: Default is to have cronserve started with kalite set_fact: diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index a815c0e91..33039e02f 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -27,25 +27,39 @@ virtualenv={{ osm_venv }} virtualenv_site_packages=no version=2.6 - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} -# extra_args="--no-cache-dir" - when: internet_available + when: internet_available and is_debuntu - name: Install IIAB with dependencies pip: name={{ item }} virtualenv={{ osm_venv }} virtualenv_site_packages=no - {% if not is_redhat %} extra_args="--no-cache-dir" - {% endif %} + with_items: + - MarkupSafe + - pytz + - Internet-in-a-Box + when: internet_available and is_debuntu + +# IIAB wants a specific version do that first +- name: Install Whoosh 2.6 + pip: name=whoosh + virtualenv={{ osm_venv }} + virtualenv_site_packages=no + version=2.6 +# extra_args="--no-cache-dir" + when: internet_available and not is_debuntu + +- name: Install IIAB with dependencies + pip: name={{ item }} + virtualenv={{ osm_venv }} + virtualenv_site_packages=no # extra_args="--no-cache-dir" with_items: - MarkupSafe - pytz - Internet-in-a-Box - when: internet_available + when: internet_available and not is_debuntu - name: Set osm_path set_fact: