From 15e35333ddb6fecade413acc5ca916cda8ed48fc Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 18 Sep 2019 12:22:24 +0100 Subject: [PATCH] Remove support for OracleLinux We have agreed to remove support for Oracle Linux. http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html Change-Id: If11b4ff37af936a0cfd34443e8babb952307882b --- ansible/group_vars/all.yml | 3 +-- ansible/roles/chrony/templates/chrony.conf.j2 | 2 +- .../reference/deployment-and-bootstrapping/bifrost.rst | 2 +- doc/source/reference/networking/neutron-extensions.rst | 2 +- .../reference/orchestration-and-nfv/tacker-guide.rst | 8 ++------ doc/source/reference/storage/swift-guide.rst | 2 +- doc/source/user/quickstart.rst | 1 - etc/kolla/globals.yml | 2 +- .../remove-oraclelinux-support-7afaf06191c02e8e.yaml | 4 ++++ 9 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/remove-oraclelinux-support-7afaf06191c02e8e.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 0769881493..3db00f6d68 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -27,7 +27,7 @@ config_owner_group: "root" # Valid options are [ COPY_ONCE, COPY_ALWAYS ] config_strategy: "COPY_ALWAYS" -# Valid options are ['centos', 'debian', 'oraclelinux', 'rhel', 'ubuntu'] +# Valid options are ['centos', 'debian', 'rhel', 'ubuntu'] kolla_base_distro: "centos" # Valid options are [ binary, source ] kolla_install_type: "binary" @@ -1083,7 +1083,6 @@ influxdb_address: "{{ kolla_internal_fqdn }}" distro_python_version_map: { "centos": "2.7", "debian": "3.7", - "oraclelinux": "2.7", "rhel": "2.7", "ubuntu": "3.6" } diff --git a/ansible/roles/chrony/templates/chrony.conf.j2 b/ansible/roles/chrony/templates/chrony.conf.j2 index 2dd20e1d67..a6c95d7aba 100644 --- a/ansible/roles/chrony/templates/chrony.conf.j2 +++ b/ansible/roles/chrony/templates/chrony.conf.j2 @@ -1,4 +1,4 @@ -{% set keyfile = '/etc/chrony.keys' if kolla_base_distro in ['centos', 'oraclelinux', 'redhat'] else '/etc/chrony/chrony.keys' %} +{% set keyfile = '/etc/chrony.keys' if kolla_base_distro in ['centos', 'redhat'] else '/etc/chrony/chrony.keys' %} server {{ kolla_internal_vip_address }} iburst {# NOTE(jeffrey4l): external_ntp_servers may be None here #} diff --git a/doc/source/reference/deployment-and-bootstrapping/bifrost.rst b/doc/source/reference/deployment-and-bootstrapping/bifrost.rst index b26611b1a0..0a4c55ccdd 100644 --- a/doc/source/reference/deployment-and-bootstrapping/bifrost.rst +++ b/doc/source/reference/deployment-and-bootstrapping/bifrost.rst @@ -151,7 +151,7 @@ be enabled by appending ``--type source`` to the :command:`kolla-build` or .. code-block:: console - --base [ubuntu|centos|oraclelinux] + --base [centos|debian|rhel|ubuntu] Configure and Deploy a Bifrost Container ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/reference/networking/neutron-extensions.rst b/doc/source/reference/networking/neutron-extensions.rst index f557bf5354..1279752b1a 100644 --- a/doc/source/reference/networking/neutron-extensions.rst +++ b/doc/source/reference/networking/neutron-extensions.rst @@ -49,7 +49,7 @@ and versioning may differ depending on deploy configuration): # docker ps --filter name=neutron_vpnaas_agent CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - 97d25657d55e operator:5000/kolla/oraclelinux-source-neutron-vpnaas-agent:4.0.0 "kolla_start" 44 minutes ago Up 44 minutes neutron_vpnaas_agent + 97d25657d55e operator:5000/kolla/centos-source-neutron-vpnaas-agent:4.0.0 "kolla_start" 44 minutes ago Up 44 minutes neutron_vpnaas_agent Kolla-Ansible includes a small script that can be used in tandem with ``tools/init-runonce`` to verify the VPN using two routers and two Nova VMs: diff --git a/doc/source/reference/orchestration-and-nfv/tacker-guide.rst b/doc/source/reference/orchestration-and-nfv/tacker-guide.rst index c22f8a00d2..5a611c707a 100644 --- a/doc/source/reference/orchestration-and-nfv/tacker-guide.rst +++ b/doc/source/reference/orchestration-and-nfv/tacker-guide.rst @@ -32,13 +32,9 @@ Compatibility Tacker is supported by the following distros and install_types. -* Centos, Redhat and Oraclelinux. +* CentOS and RHEL: Source and binary images. - * Source and binary images. - -* Debian and Ubuntu. - - * Only source images. +* Debian and Ubuntu: Only source images. Preparation and Deployment ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/reference/storage/swift-guide.rst b/doc/source/reference/storage/swift-guide.rst index 18b9c238d4..0742f84bd4 100644 --- a/doc/source/reference/storage/swift-guide.rst +++ b/doc/source/reference/storage/swift-guide.rst @@ -107,7 +107,7 @@ the environment variable and create ``/etc/kolla/config/swift`` directory: .. code-block:: console STORAGE_NODES=(192.168.0.2 192.168.0.3 192.168.0.4) - KOLLA_SWIFT_BASE_IMAGE="kolla/oraclelinux-source-swift-base:4.0.0" + KOLLA_SWIFT_BASE_IMAGE="kolla/centos-source-swift-base:4.0.0" mkdir -p /etc/kolla/config/swift Generate Object Ring diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index df7a058c65..2e8663c269 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -368,7 +368,6 @@ There are a few options that are required to deploy Kolla-Ansible: - CentOS - Ubuntu - - Oracle Linux - Debian - RHEL diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index eead8b952d..adaec9e02d 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -11,7 +11,7 @@ # Valid options are [ COPY_ONCE, COPY_ALWAYS ] #config_strategy: "COPY_ALWAYS" -# Valid options are ['centos', 'debian', 'oraclelinux', 'rhel', 'ubuntu'] +# Valid options are ['centos', 'debian', 'rhel', 'ubuntu'] #kolla_base_distro: "centos" # Valid options are [ binary, source ] diff --git a/releasenotes/notes/remove-oraclelinux-support-7afaf06191c02e8e.yaml b/releasenotes/notes/remove-oraclelinux-support-7afaf06191c02e8e.yaml new file mode 100644 index 0000000000..7c32558e00 --- /dev/null +++ b/releasenotes/notes/remove-oraclelinux-support-7afaf06191c02e8e.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for deployment of OracleLinux containers has been removed.