From 480fa37d8c95d79744c096e52ddd3fc6c5214ef0 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Tue, 21 Jun 2016 11:07:52 -0500 Subject: [PATCH] Add CentOS 7 support This patch adds CentOS 7 support to the rsyslog_server role and should have the necessary requirements to test properly in the OpenStack gate. Implements: blueprint multi-platform-host Change-Id: Idf6e1614e84c26fe72c655bdb84c2cca0c661816 --- other-requirements.txt | 10 ++++++++-- .../notes/centos-7-support-d96233f41f63cfb8.yaml | 3 +++ run_tests.sh | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/centos-7-support-d96233f41f63cfb8.yaml diff --git a/other-requirements.txt b/other-requirements.txt index 67cd643..a145f8b 100644 --- a/other-requirements.txt +++ b/other-requirements.txt @@ -14,7 +14,13 @@ # TODO(odyssey4me) remove this once https://review.openstack.org/288634 has merged # and the disk images are rebuilt and redeployed. curl +wget # Requirements for Paramiko 2.0 -libssl-dev -libffi-dev +libssl-dev [platform:dpkg] +libffi-dev [platform:dpkg] +libffi-devel [platform:rpm] +openssl-devel [platform:rpm] + +# For selinux +libselinux-python [platform:rpm] diff --git a/releasenotes/notes/centos-7-support-d96233f41f63cfb8.yaml b/releasenotes/notes/centos-7-support-d96233f41f63cfb8.yaml new file mode 100644 index 0000000..3f371a8 --- /dev/null +++ b/releasenotes/notes/centos-7-support-d96233f41f63cfb8.yaml @@ -0,0 +1,3 @@ +--- +features: + - The ``rsyslog_server`` role now has support for CentOS 7. diff --git a/run_tests.sh b/run_tests.sh index f7a19cc..40cb7ff 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -22,6 +22,10 @@ if [ "$(which apt-get)" ]; then apt-get install -y build-essential python2.7 python-dev git-core libssl-dev libffi-dev fi +if [ "$(which yum)" ]; then + yum install -y '@Development Tools' python-devel git libffi-devel openssl-devel +fi + # get pip, if necessary if [ ! "$(which pip)" ]; then curl --silent --show-error --retry 5 \