diff options
| author | Martin André <m.andre@redhat.com> | 2018-05-29 10:56:12 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2018-05-30 10:02:04 +0200 |
| commit | a126aca2982b9b0078fb10f0765855fd7b81a888 (patch) | |
| tree | e4781f9d676118477096772cb23669cd0dd1f5ab | |
| parent | 5a914622d4543436ef847feaf4dbbb1181315e65 (diff) | |
| download | kolla-a126aca2982b9b0078fb10f0765855fd7b81a888.tar.gz kolla-a126aca2982b9b0078fb10f0765855fd7b81a888.zip | |
Put upper limit on cmd2 in kolla-toolbox
This fixes an issue with cmd2 >= 0.9.0 requiring python3.
Change-Id: I08b606980cb796a6b884e69b3e6749edbdd7cf37
Closes-Bug: #1773938
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 1 | ||||
| -rwxr-xr-x | kolla/image/build.py | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 03458e261..d5647f9bd 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -79,6 +79,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ 'ansible==2.2.0.0', + '"cmd2<0.9.0"', 'MySQL-python', 'os-client-config==1.29.0', 'pbr==4.0.0', diff --git a/kolla/image/build.py b/kolla/image/build.py index 72c64bf14..a4a365072 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -95,9 +95,6 @@ SKIPPED_IMAGES = { "zun-base", ], 'centos+source': [ - # TODO(mandre) remove after fixing - # https://bugs.launchpad.net/kolla/+bug/1773938 - "kolla-toolbox", # TODO(spsurya): remove neutron-server-opendaylight fix below issue # https://bugs.launchpad.net/kolla/+bug/1764621 "neutron-server-opendaylight", @@ -137,9 +134,6 @@ SKIPPED_IMAGES = { "zun-base", ], 'ubuntu+source': [ - # TODO(mandre) remove after fixing - # https://bugs.launchpad.net/kolla/+bug/1773938 - "kolla-toolbox", # TODO(spsurya): remove neutron-server-opendaylight fix below issue # https://bugs.launchpad.net/kolla/+bug/1764621 "neutron-server-opendaylight", @@ -198,9 +192,6 @@ SKIPPED_IMAGES = { ], 'oraclelinux+source': [ "bifrost-base", - # TODO(mandre) remove after fixing - # https://bugs.launchpad.net/kolla/+bug/1773938 - "kolla-toolbox", # TODO(spsurya): remove neutron-server-opendaylight fix below issue # https://bugs.launchpad.net/kolla/+bug/1764621 "neutron-server-opendaylight", |