diff options
| author | Pierre Riteau <pierre@stackhpc.com> | 2021-08-12 10:05:50 +0200 |
|---|---|---|
| committer | Pierre Riteau <pierre@stackhpc.com> | 2021-08-12 10:05:50 +0200 |
| commit | 22def6336de9cdd872244f32429445405dc0bd3c (patch) | |
| tree | 5b93e67e106078cd3ce7f27a547da22ccf41c879 | |
| parent | cf78abccc0559171494134c1eb368b96a2b3355d (diff) | |
| download | kolla-22def6336de9cdd872244f32429445405dc0bd3c.tar.gz kolla-22def6336de9cdd872244f32429445405dc0bd3c.zip | |
[release] Use RDO master Delorean packages
CentOS binary packages for Xena have moved Neutron's api-paste.ini file
to /etc/neutron [1]. Make this file available at the old location [2]
for compatiblity with kolla-ansible, until the configuration is modified
to use the new location.
[1] https://review.rdoproject.org/r/c/openstack/neutron-distgit/+/34845
[2] /usr/share/neutron/api-paste.ini
Change-Id: I2295884ef3b4c3bf4b087599322b0c5761e7b775
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 4 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 2c8591818..210e2cefa 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -27,6 +27,10 @@ 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 = [ diff --git a/kolla/common/config.py b/kolla/common/config.py index e47530397..9a441df69 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -35,9 +35,9 @@ DISTRO_PRETTY_NAME = { OPENSTACK_RELEASE = 'master' # This is noarch repository so we will use it on all architectures -DELOREAN = "https://trunk.rdoproject.org/centos8-wallaby/" \ +DELOREAN = "https://trunk.rdoproject.org/centos8-master/" \ "consistent/delorean.repo" -DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-wallaby/" \ +DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-master/" \ "delorean-deps.repo" INSTALL_TYPE_CHOICES = ['binary', 'source'] |