diff options
| author | Zuul <zuul@review.opendev.org> | 2021-07-01 18:29:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-07-01 18:29:37 +0000 |
| commit | cc27b7ce9db3d922d3c73cec5a1e574ce788cb94 (patch) | |
| tree | 95f0ab15ba341c6aee79d1514355ee4f738c62cb | |
| parent | 76c55483bcf57f25cfd904c9590f24b2e4011bd6 (diff) | |
| parent | d55cd5e5c27464c61991be4d6b133922a763c7c3 (diff) | |
| download | kolla-cc27b7ce9db3d922d3c73cec5a1e574ce788cb94.tar.gz kolla-cc27b7ce9db3d922d3c73cec5a1e574ce788cb94.zip | |
Merge "Remove last mongo refs"
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | releasenotes/notes/drop-last-mongo-refs-c12edb066544e190.yaml | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index b4d3eb3a0..ce4b88675 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -45,7 +45,6 @@ ADD aodh-base-archive /aodh-base-source {% set aodh_base_pip_packages = [ '/aodh', - 'pymongo' ] %} RUN ln -s aodh-base-source/* aodh \ diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 019fad8de..0edcf2dc1 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ceilometer_base_packages = [ 'ceilometer-common', 'python3-gnocchiclient', - 'python3-pymongo' ] %} {% endif %} @@ -30,7 +29,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% set ceilometer_base_pip_packages = [ - '/ceilometer[gnocchi,mongo,mysql]' + '/ceilometer' ] %} {% set ceilometer_base_plugins_pip_packages = [ diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 0bea39be4..a8c013778 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -86,7 +86,6 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH 'mysqlclient', 'os-client-config', 'pbr', - 'pymongo', 'python-openstackclient', 'pytz', 'pyudev', diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index a41f1dbaa..f0b330979 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -276,7 +276,6 @@ ENV DEBIAN_FRONTEND noninteractive 'psutil', 'pycadf', 'pyinotify', - 'pymongo', 'pymysql', 'pyngus', 'pyparsing', diff --git a/releasenotes/notes/drop-last-mongo-refs-c12edb066544e190.yaml b/releasenotes/notes/drop-last-mongo-refs-c12edb066544e190.yaml new file mode 100644 index 000000000..db893e7ac --- /dev/null +++ b/releasenotes/notes/drop-last-mongo-refs-c12edb066544e190.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + Removes ``pymongo`` installation from images. |