From 679b89f307c8af9412c5ed122a75bd9ebdb63a3a Mon Sep 17 00:00:00 2001
From: Marc Gariepy <gariepy.marc@gmail.com>
Date: Mon, 28 Nov 2016 08:28:48 -0500
Subject: [PATCH] Fix virtualenv-tools issue

please see https://github.com/fireteam/virtualenv-tools/issues/5

This make installation of the virtualenv impossible on CentOS7 since
you endup with python > python2.7 and python2.7 > python

lrwxrwxrwx. 1 root root       9 Nov 24 20:49 python -> python2.7
lrwxrwxrwx. 1 root root       6 Nov 14 20:03 python2 -> python
lrwxrwxrwx. 1 root root       6 Nov 14 20:03 python2.7 -> python

Change-Id: Ic6c005bc55018898830bfc937829c6fade72e670
Related-Bug: #1637509
Partial-Bug: #1644629
---
 tasks/cinder_install.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tasks/cinder_install.yml b/tasks/cinder_install.yml
index 7e0ba782..6bce29d2 100644
--- a/tasks/cinder_install.yml
+++ b/tasks/cinder_install.yml
@@ -90,6 +90,15 @@
   when: cinder_developer_mode | bool
   notify: Restart cinder services
 
+- name: CentOS remove python from path first
+  file:
+    path:  "{{ cinder_bin | dirname }}/bin/python2.7"
+    state: "absent"
+  when:
+    - ansible_pkg_mgr == 'yum'
+    - not cinder_developer_mode | bool
+    - cinder_get_venv | changed or cinder_venv_dir | changed
+
 - name: Update virtualenv path
   command: >
     virtualenv-tools --update-path=auto --reinitialize {{ cinder_bin | dirname }}