From cd7456e025a1e668274c6abd32a461adc854d868 Mon Sep 17 00:00:00 2001 From: Karl Goetz Date: Sun, 16 Apr 2017 22:14:16 +1000 Subject: [PATCH] Remove all virtualenv references As stated in Issue #3, I am removing any attempted support for virtual environments from this role. Upstream don't support it and its so badly broken it isn't worth pretending it works. --- defaults/main.yml | 3 --- tasks/configure-shinken-webui.yml | 1 - tasks/install-shinken-packages.yml | 4 ---- tasks/prepare-for-install.yml | 6 ------ 4 files changed, 14 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 6f7abc8..999dbbf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,9 +3,6 @@ # How should things be installed, 'packages' or 'pip' shinken_install_from: 'pip' -# Where pip will install packages -shinken_virtualenv: /srv/shinken/environment - # Path of broker configuration shinken_config_broker: /etc/shinken/brokers/ diff --git a/tasks/configure-shinken-webui.yml b/tasks/configure-shinken-webui.yml index fe0a2c2..3251a33 100644 --- a/tasks/configure-shinken-webui.yml +++ b/tasks/configure-shinken-webui.yml @@ -14,7 +14,6 @@ pip: state: present name: "pymongo>=3.0.3 passlib requests arrow bottle==0.12.8" -# virtualenv: {{ shinken_virtualenv }} - name: Install mongodb for storing WebUI user preferences package: diff --git a/tasks/install-shinken-packages.yml b/tasks/install-shinken-packages.yml index 94634ae..207de6e 100644 --- a/tasks/install-shinken-packages.yml +++ b/tasks/install-shinken-packages.yml @@ -24,14 +24,10 @@ name: pycurl version: 7.43.0 state: present -# virtualenv: "{{ shinken_virtualenv }}" -# virtualenv_site_packages: yes - name: Install Shinken using pip when: shinken_install_from == "pip" pip: name: Shinken state: present -# virtualenv: "{{ shinken_virtualenv }}" -# virtualenv_site_packages: yes diff --git a/tasks/prepare-for-install.yml b/tasks/prepare-for-install.yml index eb1b086..beaf563 100644 --- a/tasks/prepare-for-install.yml +++ b/tasks/prepare-for-install.yml @@ -11,12 +11,6 @@ group: shinken system: yes -# - name: Create directory for shinken to be installed to -# when: shinken_install_from == "pip" -# file: -# path: "{{ shinken_virtualenv }}" -# state: directory - # needed to install shinken and its web ui - name: Install python-pip package: