Merge "Install upstream NGINX repository"

This commit is contained in:
Zuul 2018-06-15 02:03:31 +00:00 committed by Gerrit Code Review
commit 1d26d38f4e
2 changed files with 16 additions and 0 deletions

View File

@ -51,6 +51,20 @@
- ansible_pkg_mgr in ['yum', 'dnf']
- keystone_sp != {}
- name: Add NGINX repository
yum_repository:
name: nginx
description: 'nginx repo'
baseurl: "{{ keystone_nginx_repo }}"
gpgkey: "{{ keystone_nginx_gpg_key }}"
when:
- ansible_pkg_mgr in ['yum', 'dnf']
- keystone_web_server == 'nginx'
register: add_nginx_repo
until: add_nginx_repo is success
retries: 5
delay: 2
# If the web server being removed was never installed, this task will fail when trying
# to stop/disable it. The task is therefore set to never fail.
- name: Ensure other web server is not running/enabled

View File

@ -48,6 +48,8 @@ keystone_apache_distro_packages:
keystone_mod_wsgi_distro_packages:
- mod_wsgi
keystone_nginx_repo: http://nginx.org/packages/centos/7/$basearch/
keystone_nginx_gpg_key: http://nginx.org/keys/nginx_signing.key
keystone_nginx_distro_packages:
- nginx