diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-12 10:02:55 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-12 18:00:39 +0100 |
| commit | 6b40b655f124d0a95f1b7d89ce04236606a02010 (patch) | |
| tree | 590e491b05205a87982cd61ee326a5248ec83a10 | |
| parent | dcbc0bd89a24cd93aa8fc46a644c9d4c19dad4d5 (diff) | |
| download | kolla-6b40b655f124d0a95f1b7d89ce04236606a02010.tar.gz kolla-6b40b655f124d0a95f1b7d89ce04236606a02010.zip | |
Disable Searchlight for CentOS 7/source
Searchlight is Python 3 while CentOS 7/source images are Python 2
Change-Id: I9d2e4f3630efad91b5cc94085ad1dd1f6680e017
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 56909f77b..34fa3ac3e 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -162,6 +162,10 @@ RUN ln -s horizon-source/* horizon \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ && cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings \ && cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \ + {# NOTE(hrw) searchlight moved to Python 3 and CentOS 7 uses Python 2 #} + {% if base_package_type == 'rpm' and base_distro_tag.startswith('7') %} + && rm -rf /plugins/searchlight-ui* \ + {% endif %} && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(horizon_plugins_pip_packages) }}; \ fi \ diff --git a/kolla/image/build.py b/kolla/image/build.py index 7ab1bd33b..034133256 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -143,6 +143,11 @@ UNBUILDABLE_IMAGES = { 'centos': { "ovsdpdk", }, + + 'centos+source': { + "searchlight-base", + }, + 'debian': { "bifrost-base", # tries to install 'mysql-server' which is not in # Debian 'buster' |