Merge "SUSE: Add support for openSUSE Leap 15"

2018-11-07 21:47:41 +00:00 · 2018-11-07 21:47:41 +00:00 · 266ea9e6a9
commit 266ea9e6a9
parent f874666389 a960e83a6c
7 changed files with 89 additions and 9 deletions
--- a/15
+++ b/15
@ -80,4 +80,19 @@ Vagrant.configure(2) do |config|
      SHELL
  end

+  config.vm.define "opensuse150" do |leap150|
+    leap150.disksize.size = disk_size
+    leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
+    leap150.vm.provision "shell",
+      privileged: true,
+      inline: <<-SHELL
+        cd /vagrant
+        zypper -qn in gdisk
+        echo -e 'x\ne\nw\ny\n' | gdisk /dev/sda
+        parted -s /dev/sda unit GB resizepart 3 100%
+        btrfs fi resize max /
+        ./scripts/gate-check-commit.sh
+      SHELL
+  end
+
 end
--- a/playbooks/openstack-hosts-setup.yml
+++ b/playbooks/openstack-hosts-setup.yml
@ -47,8 +47,8 @@
          - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or
            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or
            (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or
-            (ansible_os_family == 'Suse' and ansible_distribution_major_version == '42')
-        msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic),  CentOS 7 (WIP) and openSUSE Leap 42.X (WIP)"
+            (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['15', '42'])
+        msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic),  CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X"

    - include: common-tasks/package-cache-proxy.yml
      when: install_method == "source"
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@ -88,11 +88,12 @@ case ${DISTRO_ID} in
    opensuse*)
        zypper -n install -l git-core curl autoconf gcc gcc-c++ \
            netcat-openbsd python python-xml python-devel gcc \
-            libffi-devel libopenssl-devel python-virtualenv
-        # Leap ships with python3.4 which is not supported by ansible and as
+            libffi-devel libopenssl-devel python-setuptools python-virtualenv
+        # Leap 42.3 ships with python3.4 which is not supported by ansible and as
        # such we are using python2
        # See https://github.com/ansible/ansible/issues/24180
-        PYTHON_EXEC_PATH="/usr/bin/python2"
+        source /etc/os-release
+        [[ ${VERSION} =~ 42 ]] && PYTHON_EXEC_PATH="/usr/bin/python2"
        ;;
 esac

--- a/tests/roles/bootstrap-host/tasks/check-requirements.yml
+++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml
@ -19,8 +19,8 @@
      - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or
        (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or
        (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or
-        (ansible_os_family == 'Suse' and ansible_distribution_major_version == '42')
-    msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic), CentOS 7 (WIP) and openSUSE Leap 42.X (WIP)"
+        (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['42', '15'])
+    msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic), CentOS 7 (WIP), openSUSE Leap 42.X and openSUSE Leap 15.X"
  when: (check_operating_system | default(True))| bool
  tags:
    - check-operating-system
--- a/tests/roles/bootstrap-host/tasks/prepare_hostname.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_hostname.yml
@ -30,5 +30,15 @@
    backup: yes

 - name: Ensure hostname is set
-  hostname:
-    name: aio1
+  block:
+    - name: Set hostname using the Ansible module
+      hostname:
+        name: aio1
+  # NOTE(hwoarang) The hostname module does not work on Leap 15 because of
+  # https://bugzilla.novell.com/show_bug.cgi?id=997614
+  # As such we need to fallback to using the command directly.
+  rescue:
+    - name: Set hostname using hostnamectl
+      command: hostnamectl set-hostname aio1
+  tags:
+    - skip_ansible_lint
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@ -242,6 +242,11 @@
    parent: openstack-ansible-deploy-aio
    nodeset: opensuse-423

+- job:
+    name: openstack-ansible-deploy-aio_lxc-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+
 - job:
    name: openstack-ansible-deploy-aio_distro_lxc-opensuse-423
    parent: openstack-ansible-deploy-aio
@ -249,6 +254,13 @@
    vars:
      install_method: distro

+- job:
+    name: openstack-ansible-deploy-aio_distro_lxc-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      install_method: distro
+
 - job:
    name: openstack-ansible-deploy-ceph-opensuse-423
    parent: openstack-ansible-deploy-aio
@ -257,6 +269,14 @@
      action: deploy
      scenario: ceph

+- job:
+    name: openstack-ansible-deploy-ceph-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: ceph
+
 - job:
    name: openstack-ansible-deploy-distro_ceph-opensuse-423
    parent: openstack-ansible-deploy-aio
@ -266,6 +286,15 @@
      scenario: ceph
      install_method: distro

+- job:
+    name: openstack-ansible-deploy-distro_ceph-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: ceph
+      install_method: distro
+
 - job:
    name: openstack-ansible-upgrade-aio_lxc-opensuse-423
    parent: openstack-ansible-deploy-aio
@ -283,9 +312,24 @@
      action: deploy
      scenario: aio_metal

+- job:
+    name: openstack-ansible-deploy-aio_metal-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      action: deploy
+      scenario: aio_metal
+
 - job:
    name: openstack-ansible-deploy-aio_nspawn-opensuse-423
    parent: openstack-ansible-deploy-aio
    nodeset: opensuse-423
    vars:
      scenario: aio_nspawn
+
+- job:
+    name: openstack-ansible-deploy-aio_nspawn-opensuse-150
+    parent: openstack-ansible-deploy-aio
+    nodeset: opensuse-150
+    vars:
+      scenario: aio_nspawn
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@ -43,11 +43,13 @@
      jobs:
        - openstack-ansible-deploy-aio_lxc-centos-7
        - openstack-ansible-deploy-aio_lxc-opensuse-423
+        - openstack-ansible-deploy-aio_lxc-opensuse-150
        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
    gate:
      jobs:
        - openstack-ansible-deploy-aio_lxc-centos-7
        - openstack-ansible-deploy-aio_lxc-opensuse-423
+        - openstack-ansible-deploy-aio_lxc-opensuse-150
        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
    periodic:
      jobs:
@ -62,6 +64,8 @@
            voting: false
        - openstack-ansible-deploy-aio_distro_lxc-opensuse-423:
            voting: false
+        - openstack-ansible-deploy-aio_distro_lxc-opensuse-150:
+            voting: false
        - openstack-ansible-deploy-aio_distro_lxc-ubuntu-bionic:
            voting: false
    gate:
@ -73,11 +77,13 @@
      jobs:
        - openstack-ansible-deploy-aio_metal-centos-7
        - openstack-ansible-deploy-aio_metal-opensuse-423
+        - openstack-ansible-deploy-aio_metal-opensuse-150
        - openstack-ansible-deploy-aio_metal-ubuntu-bionic
    gate:
      jobs:
        - openstack-ansible-deploy-aio_metal-centos-7
        - openstack-ansible-deploy-aio_metal-opensuse-423
+        - openstack-ansible-deploy-aio_metal-opensuse-150
        - openstack-ansible-deploy-aio_metal-ubuntu-bionic

 - project-template:
@ -88,6 +94,8 @@
            voting: false
        - openstack-ansible-deploy-aio_nspawn-opensuse-423:
            voting: false
+        - openstack-ansible-deploy-aio_nspawn-opensuse-150:
+            voting: false
        - openstack-ansible-deploy-aio_nspawn-ubuntu-bionic:
            voting: false
    gate:
@ -112,5 +120,7 @@
      jobs:
        - openstack-ansible-deploy-distro_ceph-opensuse-423:
            voting: false
+        - openstack-ansible-deploy-distro_ceph-opensuse-150:
+            voting: false
    gate:
      jobs: []