openstack/bifrost
Code Issues Proposed changes

Merge "Install uWSGI from PyPI to repair CentOS 8 support"

Browse Source
This commit is contained in:
Zuul 2020-06-05 09:27:27 +00:00 committed by Gerrit Code Review
commit 11cd5b008c
10 changed files with 62 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml
View File

@ -14,7 +14,3 @@ required_packages:
- libssl-dev
- libxml2-dev
- nginx
- uwsgi
- uwsgi-core
# - python-django-uwsgi - This may not be needed
- uwsgi-plugin-python

4
playbooks/roles/bifrost-keystone-install/defaults/required_defaults_RedHat_family.yml
View File

@ -15,10 +15,10 @@ required_packages:
- python3-devel
- python3-PyMySQL
- python3-iniparse
- python3-libselinux
- python3-policycoreutils
- libffi-devel
- libxslt-devel
- openssl-devel
- libxml2-devel
- nginx
- uwsgi
- uwsgi-plugin-python3

3
playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Suse_family.yml
View File

@ -6,6 +6,7 @@ mysql_service_name: mysql
required_packages:
- python-selinux
- mariadb
- policycoreutils-python
- python-devel
- python-MySQL-python
- python-iniparse
@ -14,5 +15,3 @@ required_packages:
- libopenssl-devel
- libxml2-devel
- nginx
- uwsgi
- uwsgi-python

4
playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu.yml
View File

@ -13,7 +13,3 @@ required_packages:
- libssl-dev
- libxml2-dev
- nginx
- uwsgi
- uwsgi-core
# - python-django-uwsgi - This may not be needed
- uwsgi-plugin-python3

11
playbooks/roles/bifrost-keystone-install/files/keystone_policy.te Normal file
View File

@ -0,0 +1,11 @@
module keystone_policy 1.0;
require {
type var_run_t;
type httpd_t;
class sock_file write;
}
#============= httpd_t ==============
allow httpd_t var_run_t:sock_file write;

27
playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml
View File

@ -284,3 +284,30 @@
- name: "Remove uwsgi sysvinit init script"
command: update-rc.d -f uwsgi remove
ignore_errors: yes
- block:
- name: "Explicitly allow keystone port (TCP) on selinux"
seport:
ports: "5000"
proto: tcp
setype: http_port_t
state: present
- name: Copy keystone policy file to temporary directory
copy:
src: keystone_policy.te
dest: /tmp/keystone_policy.te
- name: Check keystone policy module
command: checkmodule -M -m -o /tmp/keystone_policy.mod /tmp/keystone_policy.te
- name: Package keystone policy module
command: semodule_package -m /tmp/keystone_policy.mod -o /tmp/keystone_policy.pp
- name: Include keystone policy module
command: semodule -i /tmp/keystone_policy.pp
- name: Enable keystone policy module
command: semodule -e keystone_policy
when: (ansible_os_family == 'RedHat' or ansible_os_family == 'Suse') and
ansible_selinux.status == 'enabled' and ansible_selinux.mode == "enforcing"

8
playbooks/roles/bifrost-keystone-install/tasks/install.yml
View File

@ -45,6 +45,14 @@
- skip_install is not defined
- enable_venv | bool == true
- name: "Install uWSGI in venv if using"
include: pip_install.yml
package=uWSGI
virtualenv=bifrost_venv_dir
when:
- skip_install is not defined
- enable_venv | bool == true
- name: "Install python-openstackclient in venv if using"
include: pip_install.yml
package=python-openstackclient

4
releasenotes/notes/centos-keystone-acad21e70153067d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixes installing Keystone under CentOS 8.

7
zuul.d/bifrost-jobs.yaml
View File

@ -109,6 +109,13 @@
parent: bifrost-integration-tinyipa
nodeset: centos-8
- job:
name: bifrost-integration-tinyipa-keystone-centos-8
parent: bifrost-integration-tinyipa
nodeset: centos-8
vars:
enable_keystone: true
- job:
name: bifrost-integration-tinyipa-debian-buster
parent: bifrost-integration-tinyipa

2
zuul.d/project.yaml
View File

@ -10,6 +10,7 @@
- bifrost-integration-tinyipa-ubuntu-bionic
- bifrost-integration-tinyipa-centos-8
- bifrost-integration-tinyipa-keystone-ubuntu-bionic
- bifrost-integration-tinyipa-keystone-centos-8
# Non-voting jobs
- bifrost-integration-tinyipa-opensuse-15:
voting: false
@ -36,3 +37,4 @@
- bifrost-integration-tinyipa-ubuntu-bionic
- bifrost-integration-tinyipa-centos-8
- bifrost-integration-tinyipa-keystone-ubuntu-bionic
- bifrost-integration-tinyipa-keystone-centos-8