Skip to content
Snippets Groups Projects
Commit 9c195147 authored by Will Szumski's avatar Will Szumski
Browse files

Skip buggy release of docker PyPI package

The tag regex is buggy and fails if the docker registry contains a port
number[1].

[1] https://github.com/docker/docker-py/issues/3195

Change-Id: I5d85e751b490ab1e39e417ff8797ca8f8688590b
Closes-Bug: #2054715
parent 292125b5
No related branches found
No related tags found
No related merge requests found
...@@ -67,7 +67,9 @@ ...@@ -67,7 +67,9 @@
version: "{{ item.version | default(omit) }}" version: "{{ item.version | default(omit) }}"
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
virtualenv: "{{ kolla_venv }}" virtualenv: "{{ kolla_venv }}"
extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}" extra_args: "{{ item.extra_args | default(default_extra_args) }}"
vars:
default_extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
with_items: with_items:
# Install Kolla from source. # Install Kolla from source.
- name: "{{ kolla_source_path }}" - name: "{{ kolla_source_path }}"
...@@ -77,5 +79,10 @@ ...@@ -77,5 +79,10 @@
version: "{{ kolla_openstack_release }}" version: "{{ kolla_openstack_release }}"
install: "{{ kolla_ctl_install_type == 'binary' }}" install: "{{ kolla_ctl_install_type == 'binary' }}"
# Install docker from PyPI since it was dropped from kolla requirements. # Install docker from PyPI since it was dropped from kolla requirements.
- name: "docker" # Skip 7.0.0 due to: https://github.com/docker/docker-py/issues/3195
- name: "docker!=7.0.0,<8"
# NOTE(wszumski): Workaround for ERROR: ResolutionImpossible when using upper constraints.
# This can be removed once a newer version of docker is released and the version in upper
# constraints has been bumped (>7.0.0).
extra_args: "{{ omit }}"
when: item.install | default(True) | bool when: item.install | default(True) | bool
---
fixes:
- |
Fixes issue building container images when docker registry contained a
port. See `LP#2054715 <https://bugs.launchpad.net/kayobe/+bug/2054715>`__
for more details.
...@@ -221,7 +221,6 @@ ...@@ -221,7 +221,6 @@
Base job for testing seed image builds. Base job for testing seed image builds.
Configures the primary VM as a seed. Configures the primary VM as a seed.
voting: false
vars: vars:
build_images: true build_images: true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment