From 5a850592022450d9af85c37b0266fa9b7d317173 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 4 Oct 2021 11:12:24 +0200
Subject: [PATCH] Remove neutron api-paste.ini from old location

We have been configuring neutron to use /etc/neutron/api-paste.ini for
more than a month now. Remove this file from its old location before
Xena is released. Stop creating /usr/share/neutron which is now unused.

Change-Id: Ic90cd8e3065fa629d5ad67abaf7c193fd845259a
---
 docker/neutron/neutron-base/Dockerfile.j2        | 16 ++--------------
 .../neutron-api-paste-2268bcb3e0156e62.yaml      |  6 ++++++
 2 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/neutron-api-paste-2268bcb3e0156e62.yaml

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 210e2cefa4..6dac6425c8 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -27,10 +27,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python3-oslo-vmware'
         ] %}
 
-# TODO(priteau): Remove once kolla-ansible uses /etc/neutron/api-paste.ini
-RUN mkdir -p /usr/share/neutron \
-    && ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
-
     {% elif base_package_type == 'deb' %}
 
         {% set neutron_base_packages = [
@@ -50,13 +46,6 @@ RUN mkdir -p /usr/share/neutron \
 
 {{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
 
-    {% if base_package_type == 'deb' %}
-
-RUN mkdir -p /usr/share/neutron \
-    && ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
-
-    {% endif %}
-
 {% elif install_type == 'source' %}
     {% if base_package_type == 'rpm' %}
 
@@ -115,12 +104,11 @@ ADD plugins-archive /
 RUN ln -s neutron-base-source/* neutron \
     && sed -i /^neutron=/d /requirements/upper-constraints.txt \
     && {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/neutron /usr/share/neutron \
+    && mkdir -p /etc/neutron \
     && cp -r /neutron/etc/* /etc/neutron/ \
     && cp -r /neutron/etc/neutron/* /etc/neutron/ \
-    && cp /neutron/etc/api-paste.ini /usr/share/neutron \
     && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
-    && chown -R neutron: /etc/neutron /usr/share/neutron \
+    && chown -R neutron: /etc/neutron \
     && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf \
     && if [ "$(ls /plugins)" ]; then \
         {{ macros.install_pip(neutron_base_plugins_pip_packages) }} \
diff --git a/releasenotes/notes/neutron-api-paste-2268bcb3e0156e62.yaml b/releasenotes/notes/neutron-api-paste-2268bcb3e0156e62.yaml
new file mode 100644
index 0000000000..f4d5411773
--- /dev/null
+++ b/releasenotes/notes/neutron-api-paste-2268bcb3e0156e62.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Neutron images now only provide ``api-paste.ini`` in ``/etc/neutron``
+    instead of ``/usr/share/neutron``.  Custom configuration files will need to
+    be updated.