diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-16 10:12:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-16 10:12:49 +0000 |
| commit | a5e9a8df50d368d20d3aa426233ea07e59b8b190 (patch) | |
| tree | 6bd109161bc3fafccc447742687fde0a651fdbe8 | |
| parent | 6f450a10ed04eff84c8d12e33bc1c5e710347d0a (diff) | |
| parent | 22def6336de9cdd872244f32429445405dc0bd3c (diff) | |
| download | kolla-a5e9a8df50d368d20d3aa426233ea07e59b8b190.tar.gz kolla-a5e9a8df50d368d20d3aa426233ea07e59b8b190.zip | |
Merge "[release] Use RDO master Delorean packages"
| -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'] |