openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
Martin André 2018-05-29 10:56:12 +02:00
parent 5a914622d4
commit a126aca298
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/kolla-toolbox/Dockerfile.j2
View File

@ -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',

9
kolla/image/build.py
View File

@ -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",