Merge "Remove support for OracleLinux"

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"
 }

ansible/roles/chrony/templates/chrony.conf.j2

-{% 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 #}

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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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:

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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

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

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
 

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 ]

releasenotes/notes/remove-oraclelinux-support-7afaf06191c02e8e.yaml

+---
+upgrade:
+  - |
+    Support for deployment of OracleLinux containers has been removed.