From 5f13a94858c8278823525875a70d0f75925262b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:02:55 -0400 Subject: [PATCH] Update main.yml --- roles/osm/tasks/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index a0d34e321..a9ed97c62 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Install OSM required packages +- name: Install OSM required packages (debuntu) package: name: "{{ item }}" state: present @@ -10,7 +10,7 @@ - libapache2-mod-xsendfile when: is_debuntu -- name: Install OSM required packages +- name: Install OSM required packages (not debuntu) package: name: "{{ item }}" state: present @@ -24,16 +24,16 @@ when: not is_debuntu # OSM wants a specific version do that first -- name: Install Whoosh 2.6 +- name: Install Whoosh 2.6 (debuntu) pip: - name=whoosh + name: whoosh virtualenv: "{{ osm_venv }}" virtualenv_site_packages: no version: 2.6 extra_args: "--no-cache-dir" when: internet_available and is_debuntu -- name: Install Flask 0.12X +- name: Install Flask 0.12X (debuntu) pip: name: Flask virtualenv: "{{ osm_venv }}" @@ -42,7 +42,7 @@ extra_args: "--no-cache-dir" when: internet_available and is_debuntu -- name: Install OSM with dependencies +- name: Install OSM with dependencies (debuntu) pip: name: "{{ item }}" virtualenv: "{{ osm_venv }}" @@ -55,7 +55,7 @@ when: internet_available and is_debuntu # OSM wants a specific version do that first -- name: Install Whoosh 2.6 +- name: Install Whoosh 2.6 (not debuntu) pip: name: whoosh virtualenv: "{{ osm_venv }}" @@ -64,16 +64,16 @@ # extra_args="--no-cache-dir" when: internet_available and not is_debuntu -- name: Install Flask 0.12X +- name: Install Flask 0.12X (not debuntu) pip: - name=Flask + name: Flask virtualenv: "{{ osm_venv }}" virtualenv_site_packages: no version: 0.12.4 # extra_args="--no-cache-dir" when: internet_available and not is_debuntu -- name: Install OSM with dependencies +- name: Install OSM with dependencies (not debuntu) pip: name: "{{ item }}" virtualenv: "{{ osm_venv }}" @@ -85,12 +85,12 @@ - Internet-in-a-Box when: internet_available and not is_debuntu -- name: Set osm_path +- name: Set osm_path (redhat) set_fact: osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" when: osm_enabled and is_redhat -- name: Set osm_path +- name: Set osm_path (debuntu) set_fact: osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" when: osm_enabled and is_debuntu