openstack
/
openstack-ansible-os_keystone
Code Issues Proposed changes

Add dnf support 

This patch adds dnf support for CentOS.

Implements: blueprint centos-and-dnf
Change-Id: If5bfda4ee91e308e0a6d29ea13bd793d22132ba7
This commit is contained in:
Major Hayden 2017-08-02 13:36:08 -05:00
parent bd6fd7a51c
commit 31db740862
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/keystone_apache.yml
View File

@ -52,7 +52,7 @@
line: 'LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so'
state: "present"
when:
- ansible_pkg_mgr == 'yum'
- ansible_pkg_mgr in ['yum', 'dnf']
notify:
- Restart web server

10
tasks/keystone_install.yml
View File

@ -25,7 +25,8 @@
- { path: "/etc/pki/tls/private", owner: "root", group: "root" }
- { path: "/var/lock/keystone", mode: "2755" }
- { path: "/var/log/httpd", mode: "2755" }
when: ansible_pkg_mgr == 'yum'
when:
- ansible_pkg_mgr in ['yum', 'dnf']
- name: Create system links
file:
@ -36,7 +37,8 @@
- { src: "/etc/pki/tls/certs", dest: "/etc/ssl/certs" }
- { src: "/etc/pki/tls/private", dest: "/etc/ssl/private" }
- { src: "/var/log/httpd", dest: "/var/log/apache2" }
when: ansible_pkg_mgr == 'yum'
when:
- ansible_pkg_mgr in ['yum', 'dnf']
- name: Add shibboleth repo
yum_repository:
@ -46,7 +48,7 @@
gpgkey: "http://download.opensuse.org/repositories/security:/shibboleth/CentOS_7//repodata/repomd.xml.key"
gpgcheck: yes
when:
- ansible_pkg_mgr == 'yum'
- ansible_pkg_mgr in ['yum', 'dnf']
- keystone_sp != {}
# If the web server being removed was never installed, this task will fail when trying
@ -162,7 +164,7 @@
path: "{{ keystone_bin | dirname }}/bin/python2.7"
state: "absent"
when:
- ansible_pkg_mgr == 'yum'
- ansible_pkg_mgr in ['yum', 'dnf']
- keystone_get_venv | changed
- name: Update virtualenv path