diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-04 17:08:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-04 17:08:47 +0000 |
| commit | 1255eec797d324d68ce0028e7a9f74d11bca0fe9 (patch) | |
| tree | b29e25935169dab93662d78f1ece65b36f263129 | |
| parent | 26e468ba4033a8b82dfde9866301d9bc6efb2a9c (diff) | |
| parent | 5a850592022450d9af85c37b0266fa9b7d317173 (diff) | |
| download | kolla-1255eec797d324d68ce0028e7a9f74d11bca0fe9.tar.gz kolla-1255eec797d324d68ce0028e7a9f74d11bca0fe9.zip | |
Merge "Remove neutron api-paste.ini from old location"
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | releasenotes/notes/neutron-api-paste-2268bcb3e0156e62.yaml | 6 |
2 files changed, 8 insertions, 14 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 210e2cefa..6dac6425c 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 000000000..f4d541177 --- /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. |