From c42f59b36ce000f278fbad61344007bb2327da2a Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 26 Sep 2018 11:47:40 +0100 Subject: [PATCH] SUSE: Add support for openSUSE Leap 15 Change-Id: I7b915fd1688456673254fdb549ff93828087284d --- meta/main.yml | 4 +--- tasks/horizon_apache.yml | 5 +++-- zuul.d/project.yaml | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 36db322c..3246bd0e 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -29,9 +29,7 @@ galaxy_info: - 7 - name: opensuse versions: - - 42.1 - - 42.2 - - 42.3 + - all categories: - cloud - python diff --git a/tasks/horizon_apache.yml b/tasks/horizon_apache.yml index 5701635e..eda66e4b 100644 --- a/tasks/horizon_apache.yml +++ b/tasks/horizon_apache.yml @@ -110,11 +110,12 @@ line: "ServerSignature {{ horizon_apache_serversignature }}" 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 lineinfile: dest: "{{ horizon_apache_security_conf }}" - regexp: '^(Listen.*)' + regexp: "{{ (ansible_pkg_mgr == 'zypper') | ternary('^(Include.*listen\\.conf)', '^(Listen.*)') }}" backrefs: yes line: '#\1' notify: Restart apache2 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 2b158dfa..b3c667ec 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -22,9 +22,11 @@ jobs: - openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-opensuse-423 + - openstack-ansible-functional-distro_install-opensuse-150 - openstack-ansible-functional-distro_install-ubuntu-xenial gate: jobs: - openstack-ansible-functional-distro_install-centos-7 - openstack-ansible-functional-distro_install-opensuse-423 + - openstack-ansible-functional-distro_install-opensuse-150 - openstack-ansible-functional-distro_install-ubuntu-xenial