From 2701e37f780c6524ac8954a7a3d03b1e292fcff8 Mon Sep 17 00:00:00 2001
From: Aaron Mehar <aaron@mehar.me>
Date: Thu, 23 Nov 2017 12:53:55 +0000
Subject: [PATCH] Adds CentOS 7 support

Fix circular python issues, same fix in Keystone and Barbican

Change-Id: I77e60ed42ab43e3f5984b8a52dc5898325df1c8e
---
 meta/main.yml           |  3 +++
 tasks/trove_install.yml |  8 ++++++++
 vars/redhat.yml         | 31 +++++++++++++++++++++++++++++++
 zuul.d/project.yaml     |  2 ++
 4 files changed, 44 insertions(+)
 create mode 100644 vars/redhat.yml

diff --git a/meta/main.yml b/meta/main.yml
index 8942a04..03cff74 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -10,6 +10,9 @@ galaxy_info:
   - name: Ubuntu
     versions:
     - xenial
+  - name: EL
+    versions:
+    - 7
   galaxy_tags:
    - cloud
    - openstack
diff --git a/tasks/trove_install.yml b/tasks/trove_install.yml
index 5ecad12..bc8ca50 100644
--- a/tasks/trove_install.yml
+++ b/tasks/trove_install.yml
@@ -113,6 +113,14 @@
     - Restart trove taskmanager service
     - Restart Apache
 
+- name: Remove python from path first (CentOS, openSUSE)
+  file:
+    path:  "{{ trove_bin | dirname }}/bin/python2.7"
+    state: "absent"
+  when:
+    - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
+    - trove_get_venv | changed
+
 - name: Update virtualenv path
   command: >
     virtualenv-tools --update-path=auto --reinitialize {{ trove_bin | dirname }}
diff --git a/vars/redhat.yml b/vars/redhat.yml
new file mode 100644
index 0000000..cfbeb69
--- /dev/null
+++ b/vars/redhat.yml
@@ -0,0 +1,31 @@
+---
+# Copyright 2017
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
+# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
+cache_timeout: 600
+
+trove_distro_packages:
+  - gcc
+  - gcc-c++
+  - git
+  - httpd
+  - httpd-tools
+  - libxslt-devel
+  - mariadb
+  - mod_wsgi
+  - python-devel
+  - python-pip
+  - qemu-img
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 11d5d24..38e0e11 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -19,7 +19,9 @@
       jobs:
         - openstack-ansible-linters
         - openstack-ansible-functional-ubuntu-xenial
+        - openstack-ansible-functional-centos-7
     gate:
       jobs:
         - openstack-ansible-linters
         - openstack-ansible-functional-ubuntu-xenial
+        - openstack-ansible-functional-centos-7