diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 07698814930336c611ee062ad49a43f846bed431..3db00f6d68aa7c6e5c3dba9115e5453319ca1669 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 2dd20e1d6752fefb11713aef0e40ac5accdea89c..a6c95d7aba3b33612cd67a117b973881da23cb5a 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 b26611b1a0fda694f24f943e5b0f0f26961c3310..0a4c55ccdd3833e51cfad5bb8d5e2f060810e2ea 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 f557bf535471181d92fa7e9522790ce200c013f7..1279752b1aca58830d74d8a87147141eff6af942 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 c22f8a00d25d4abdad2c305da7907e10025e6be9..5a611c707a77f7ecdc29a3e498f41f7cb1fe198e 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 18b9c238d40c76904257fbe7e03579f7159c42b8..0742f84bd4489e3f1d8b348889c69f956b4e67bc 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 df7a058c658f55ca2aa02c78b2547f631bba536c..2e8663c269257d5da165ac5571f0d07dd5d3c5f0 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 eead8b952d0a16e6dbdbe77a6aa88d5b72fb3e29..adaec9e02deafb6ee69ab5d1b22bdf249df2390a 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 0000000000000000000000000000000000000000..7c32558e005546ba283bf1c71552019923466f76
--- /dev/null
+++ b/releasenotes/notes/remove-oraclelinux-support-7afaf06191c02e8e.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ Support for deployment of OracleLinux containers has been removed.