openstack/kolla
Code Issues Proposed changes

Remove neutron api-paste.ini from old location

Browse Source 
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
This commit is contained in:
Pierre Riteau 2021-10-04 11:12:24 +02:00
parent c729bc21e8
commit 5a85059202
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -27,10 +27,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-oslo-vmware' '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' %} {% elif base_package_type == 'deb' %}
{% set neutron_base_packages = [ {% set neutron_base_packages = [
@ -50,13 +46,6 @@ RUN mkdir -p /usr/share/neutron \
{{ macros.install_packages(neutron_base_packages | customizable("packages")) }} {{ 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' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
@ -115,12 +104,11 @@ ADD plugins-archive /
RUN ln -s neutron-base-source/* neutron \ RUN ln -s neutron-base-source/* neutron \
&& sed -i /^neutron=/d /requirements/upper-constraints.txt \ && sed -i /^neutron=/d /requirements/upper-constraints.txt \
&& {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \ && {{ 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/* /etc/neutron/ \
&& cp -r /neutron/etc/neutron/* /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/ \ && 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 \ && 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 \ && if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_base_plugins_pip_packages) }} \ {{ macros.install_pip(neutron_base_plugins_pip_packages) }} \

6
releasenotes/notes/neutron-api-paste-2268bcb3e0156e62.yaml Normal file
View File

@ -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.