From 979bcae918e8c270177b2deba79d52e225a8eb2b Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 3 Jun 2020 09:52:13 +0200 Subject: [PATCH] Remove support for Ubuntu Xenial and Debian Stretch They're broken already, no point in officially supporting them. Bring support back would require supporting Python 3.5 and other old packages. Change-Id: I8012f0cdf2430723379367eb6ab49c3fc0b3d32a --- doc/source/install/index.rst | 2 +- doc/source/user/howto.rst | 2 +- doc/source/user/vagrant.rst | 2 +- .../meta/main.yml | 2 -- .../roles/bifrost-create-dib-image/README.md | 4 +-- .../bifrost-create-dib-image/meta/main.yml | 2 -- .../bifrost-create-dib-image/tasks/main.yml | 4 +-- .../bifrost-create-vm-nodes/meta/main.yml | 2 -- .../meta/main.yml | 2 -- ...18.04.yml => required_defaults_Ubuntu.yml} | 0 .../required_defaults_Ubuntu_16.04.yml | 36 ------------------- ...16.04.yml => required_defaults_Ubuntu.yml} | 0 .../required_defaults_Ubuntu_18.04.yml | 19 ---------- .../bifrost-keystone-install/meta/main.yml | 8 ++++- playbooks/test-bifrost.yaml | 4 +-- .../notes/no-xenial-1c27b7bb2cf165ed.yaml | 6 ++++ 16 files changed, 22 insertions(+), 73 deletions(-) rename playbooks/roles/bifrost-ironic-install/defaults/{required_defaults_Ubuntu_18.04.yml => required_defaults_Ubuntu.yml} (100%) delete mode 100644 playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml rename playbooks/roles/bifrost-keystone-install/defaults/{required_defaults_Ubuntu_16.04.yml => required_defaults_Ubuntu.yml} (100%) delete mode 100644 playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml create mode 100644 releasenotes/notes/no-xenial-1c27b7bb2cf165ed.yaml diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index e193d111b..05ff05af2 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -20,7 +20,7 @@ Installation and use of bifrost is split into roughly three steps: Supported operating systems: -* Ubuntu 16.04, 18.04 +* Ubuntu 18.04 * Red Hat Enterprise Linux (RHEL) 8 * CentOS 8 * openSUSE Leap 15.1 diff --git a/doc/source/user/howto.rst b/doc/source/user/howto.rst index 32650893b..0f66d2a71 100644 --- a/doc/source/user/howto.rst +++ b/doc/source/user/howto.rst @@ -275,7 +275,7 @@ Bifrost supports the ability for a user to build a custom IPA ramdisk utilizing diskimage-builder and ironic-python-agent-builder. In order to utilize this feature, the ``download_ipa`` setting must be set to ``false`` and the create_ipa_image must be set to "true". By default, the install -playbook will build a Debian stretch based IPA image, if a pre-existing IPA +playbook will build a Debian Buster based IPA image, if a pre-existing IPA image is not present on disk. If you wish to explicitly set a specific release to be passed to diskimage-create, then the setting ``dib_os_release`` can be set in addition to ``dib_os_element``. diff --git a/doc/source/user/vagrant.rst b/doc/source/user/vagrant.rst index 6fce3a771..5ae2c6cc5 100644 --- a/doc/source/user/vagrant.rst +++ b/doc/source/user/vagrant.rst @@ -40,7 +40,7 @@ Setup vagrant by: Configure Vagrant with the correct box:: - vagrant box add ubuntu/xenial64 + vagrant box add ubuntu/bionic64 Clone bifrost repo:: diff --git a/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml b/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml index de0b1df8a..74afdf34a 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml +++ b/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml @@ -11,11 +11,9 @@ galaxy_info: - 8 - name: Ubuntu versions: - - xenial - bionic - name: Debian versions: - - stretch - buster categories: - cloud diff --git a/playbooks/roles/bifrost-create-dib-image/README.md b/playbooks/roles/bifrost-create-dib-image/README.md index 3f75687a5..de14a666a 100644 --- a/playbooks/roles/bifrost-create-dib-image/README.md +++ b/playbooks/roles/bifrost-create-dib-image/README.md @@ -59,9 +59,9 @@ dib_os_release can be utilized to set the DIB_RELEASE environment variable for semi-dynamic disk image creation by a user or the test script. By default, it is not set, but an example if dib_os_element is set to ``debian``, then a user could choose -the ``stretch`` release. +the ``buster`` release. -dib_os_release: stretch +dib_os_release: buster All the other command-line options to disk-image-create or ramdisk-image-create can be used by the role. The following is a list diff --git a/playbooks/roles/bifrost-create-dib-image/meta/main.yml b/playbooks/roles/bifrost-create-dib-image/meta/main.yml index 8725ea968..054f9b9d5 100644 --- a/playbooks/roles/bifrost-create-dib-image/meta/main.yml +++ b/playbooks/roles/bifrost-create-dib-image/meta/main.yml @@ -11,11 +11,9 @@ galaxy_info: - 8 - name: Debian versions: - - stretch - buster - name: Ubuntu versions: - - xenial - bionic categories: - cloud diff --git a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml index 2f60666d4..726753ba1 100644 --- a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml +++ b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml @@ -111,9 +111,9 @@ set_fact: dib_packages_arg: "-p {{dib_packages}}" when: dib_packages is defined and dib_packages != "" -- name: "Set default of Debian Stretch if building debian and not explicitly set, overwride with dib_os_release setting" +- name: "Set default of Debian Buster if building debian and not explicitly set, overwride with dib_os_release setting" set_fact: - dib_os_release: "stretch" + dib_os_release: "buster" when: dib_os_element == "debian" and dib_os_release is undefined - name: "Initialize DIB source-repository variables" set_fact: diff --git a/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml b/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml index bd880d2cb..006a720bf 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml @@ -11,11 +11,9 @@ galaxy_info: - 8 - name: Debian versions: - - stretch - buster - name: Ubuntu versions: - - xenial - bionic categories: - cloud diff --git a/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml b/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml index c7b7567ce..11be788cc 100644 --- a/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml +++ b/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml @@ -11,11 +11,9 @@ galaxy_info: - 8 - name: Debian versions: - - stretch - buster - name: Ubuntu versions: - - xenial - bionic categories: - cloud diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu.yml similarity index 100% rename from playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_18.04.yml rename to playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu.yml diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml deleted file mode 100644 index 971fd6b69..000000000 --- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Ubuntu_16.04.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -init_template: systemd_template.j2 -init_dest_dir: /lib/systemd/system/ -init_ext: .service -required_packages: - - mariadb-server - - python3-dev - - python3-mysqldb - - python3-pymysql - - python3-setuptools - - libffi-dev - - libxslt1-dev - - libssl-dev - - libxml2-dev - - ipxe - - tftpd-hpa - - tftp-hpa - - xinetd - - parted - - iptables - - bsdmainutils - - ipmitool - - psmisc - - nginx - - wget - - genisoimage - - kpartx - - qemu-utils - - debootstrap - - uuid-runtime - - curl - - dnsmasq -# NOTE(TheJulia): The above entry for dnsmasq must be the last entry in the -# package list as the installation causes name resolution changes that can -# temporarily block packages following it while the system is being -# reconfigured. See: https://review.opendev.org/#/c/223813 diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu.yml similarity index 100% rename from playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_16.04.yml rename to playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu.yml diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml deleted file mode 100644 index 2f199ddaa..000000000 --- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu_18.04.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -init_template: systemd_template.j2 -init_dest_dir: /lib/systemd/system/ -init_ext: .service -required_packages: - - mariadb-server - - python3-dev - - python3-mysqldb - - python3-pymysql - - python3-setuptools - - libffi-dev - - libxslt1-dev - - libssl-dev - - libxml2-dev - - nginx - - uwsgi - - uwsgi-core - # - python-django-uwsgi - This may not be needed - - uwsgi-plugin-python3 diff --git a/playbooks/roles/bifrost-keystone-install/meta/main.yml b/playbooks/roles/bifrost-keystone-install/meta/main.yml index 29b3dc45a..1e60ef438 100644 --- a/playbooks/roles/bifrost-keystone-install/meta/main.yml +++ b/playbooks/roles/bifrost-keystone-install/meta/main.yml @@ -6,9 +6,15 @@ galaxy_info: license: Apache min_ansible_version: 2.1 platforms: + - name: EL + versions: + - 8 - name: Ubuntu versions: - - xenial + - bionic + - name: Debian + versions: + - buster categories: - cloud - cloud:openstack diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml index f5f27e7d5..9d84f674e 100644 --- a/playbooks/test-bifrost.yaml +++ b/playbooks/test-bifrost.yaml @@ -77,9 +77,9 @@ # NOTE(TheJulia): While the next step creates a ramdisk, some elements # do not support ramdisk-image-create as they invoke steps to cleanup # the ramdisk which causes ramdisk-image-create to believe it failed. - - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "stretch", dib_elements: "ironic-python-agent-ramdisk {{ ipa_extra_dib_elements | default('') }}", dib_packages: "bsdmainutils", when: create_ipa_image | bool } + - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "buster", dib_elements: "ironic-python-agent-ramdisk {{ ipa_extra_dib_elements | default('') }}", dib_packages: "bsdmainutils", when: create_ipa_image | bool } # NOTE(TheJulia): This creates the guest image. - - { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_os_release: "stretch", dib_elements: "vm enable-serial-console simple-init {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool and not transform_boot_image | bool } + - { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_os_release: "buster", dib_elements: "vm enable-serial-console simple-init {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool and not transform_boot_image | bool } - role: bifrost-keystone-client-config user: "{{ ansible_env.SUDO_USER | default(ansible_user_id) }}" clouds: diff --git a/releasenotes/notes/no-xenial-1c27b7bb2cf165ed.yaml b/releasenotes/notes/no-xenial-1c27b7bb2cf165ed.yaml new file mode 100644 index 000000000..ef41b2929 --- /dev/null +++ b/releasenotes/notes/no-xenial-1c27b7bb2cf165ed.yaml @@ -0,0 +1,6 @@ +--- +other: + - | + Support for Ubuntu Xenial and Debian Stretch has been officially removed + (Bifrost has been broken on them since Ussuri because of the transition + to Python 3.6).