Skip to content

Commit 5a85059

Browse files
committed
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
1 parent c729bc2 commit 5a85059

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

docker/neutron/neutron-base/Dockerfile.j2

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2727
'python3-oslo-vmware'
2828
] %}
2929

30-
# TODO(priteau): Remove once kolla-ansible uses /etc/neutron/api-paste.ini
31-
RUN mkdir -p /usr/share/neutron \
32-
&& ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
33-
3430
{% elif base_package_type == 'deb' %}
3531

3632
{% set neutron_base_packages = [
@@ -50,13 +46,6 @@ RUN mkdir -p /usr/share/neutron \
5046

5147
{{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
5248

53-
{% if base_package_type == 'deb' %}
54-
55-
RUN mkdir -p /usr/share/neutron \
56-
&& ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
57-
58-
{% endif %}
59-
6049
{% elif install_type == 'source' %}
6150
{% if base_package_type == 'rpm' %}
6251

@@ -115,12 +104,11 @@ ADD plugins-archive /
115104
RUN ln -s neutron-base-source/* neutron \
116105
&& sed -i /^neutron=/d /requirements/upper-constraints.txt \
117106
&& {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \
118-
&& mkdir -p /etc/neutron /usr/share/neutron \
107+
&& mkdir -p /etc/neutron \
119108
&& cp -r /neutron/etc/* /etc/neutron/ \
120109
&& cp -r /neutron/etc/neutron/* /etc/neutron/ \
121-
&& cp /neutron/etc/api-paste.ini /usr/share/neutron \
122110
&& mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
123-
&& chown -R neutron: /etc/neutron /usr/share/neutron \
111+
&& chown -R neutron: /etc/neutron \
124112
&& 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 \
125113
&& if [ "$(ls /plugins)" ]; then \
126114
{{ macros.install_pip(neutron_base_plugins_pip_packages) }} \
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
upgrade:
3+
- |
4+
Neutron images now only provide ``api-paste.ini`` in ``/etc/neutron``
5+
instead of ``/usr/share/neutron``. Custom configuration files will need to
6+
be updated.

0 commit comments

Comments
 (0)