From 6c07c1cd005915601fe912272f0c3cecc9a48d6c Mon Sep 17 00:00:00 2001 From: Jeff Albert Date: Mon, 12 Mar 2018 11:20:28 -0700 Subject: [PATCH] Add CentOS deployment support Add the necessary vars file for CentOS support, and adjust the role to ensure that the variables are picked up and the role is tested on CentOS. Change-Id: I2d99c57c5e00c9805aaeac0e7e2f173ff3b69837 Closes-Bug: 1755253 --- tasks/main.yml | 3 +++ vars/redhat-7.yml | 24 ++++++++++++++++++++++++ zuul.d/project.yaml | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 vars/redhat-7.yml diff --git a/tasks/main.yml b/tasks/main.yml index 872e08b..a48dcd2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -17,7 +17,10 @@ include_vars: "{{ item }}" with_first_found: - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml" + - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml" + - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml" - "{{ ansible_distribution | lower }}.yml" + - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml" - "{{ ansible_os_family | lower }}.yml" tags: - always diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml new file mode 100644 index 0000000..02c7807 --- /dev/null +++ b/vars/redhat-7.yml @@ -0,0 +1,24 @@ +--- +# Copyright 2016, Comcast Corporation +# +# 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. + +rally_distro_packages: + - openssl-devel + - libffi-devel + - python-devel + - libxml2-devel + - libxslt-devel + - postgresql-libs + - git + - wget diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b16b61a..21079da 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -17,6 +17,7 @@ jobs: - openstack-ansible-linters - openstack-ansible-functional-ubuntu-xenial + - openstack-ansible-functional-centos-7 experimental: jobs: - openstack-ansible-integrated-deploy-aio @@ -24,3 +25,4 @@ jobs: - openstack-ansible-linters - openstack-ansible-functional-ubuntu-xenial + - openstack-ansible-functional-centos-7