openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Merge "SUSE: Add support for openSUSE Leap 15"

Browse Source
This commit is contained in:
Zuul 2018-10-03 17:39:21 +00:00 committed by Gerrit Code Review
commit 28bba661a1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/main.yml
View File

@ -29,9 +29,7 @@ galaxy_info:
- 7 - 7
- name: opensuse - name: opensuse
versions: versions:
- 42.1 - all
- 42.2
- 42.3
categories: categories:
- cloud - cloud
- python - python

5
tasks/horizon_apache.yml
View File

@ -110,11 +110,12 @@
line: "ServerSignature {{ horizon_apache_serversignature }}" line: "ServerSignature {{ horizon_apache_serversignature }}"
notify: Restart apache2 notify: Restart apache2
# Removing the Listen from apache config to prevent conflicts with ports.conf on CentOS # Removing the Listen (or listen.conf inclusion) from apache config to prevent
# conflicts with ports.conf on CentOS and openSUSE
- name: Remove Listen from Apache config - name: Remove Listen from Apache config
lineinfile: lineinfile:
dest: "{{ horizon_apache_security_conf }}" dest: "{{ horizon_apache_security_conf }}"
regexp: '^(Listen.*)' regexp: "{{ (ansible_pkg_mgr == 'zypper') | ternary('^(Include.*listen\\.conf)', '^(Listen.*)') }}"
backrefs: yes backrefs: yes
line: '#\1' line: '#\1'
notify: Restart apache2 notify: Restart apache2

2
zuul.d/project.yaml
View File

@ -22,9 +22,11 @@
jobs: jobs:
- openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-centos-7
- openstack-ansible-functional-distro_install-opensuse-423 - openstack-ansible-functional-distro_install-opensuse-423
- openstack-ansible-functional-distro_install-opensuse-150
- openstack-ansible-functional-distro_install-ubuntu-xenial - openstack-ansible-functional-distro_install-ubuntu-xenial
gate: gate:
jobs: jobs:
- openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-centos-7
- openstack-ansible-functional-distro_install-opensuse-423 - openstack-ansible-functional-distro_install-opensuse-423
- openstack-ansible-functional-distro_install-opensuse-150
- openstack-ansible-functional-distro_install-ubuntu-xenial - openstack-ansible-functional-distro_install-ubuntu-xenial