Skip to content

Commit ca00700

Browse files
committed
[2024.2 and 2024.1 only] Fix issue with 'pycadf' installation
Fixes the issue introduced in I5a9162a30b23cfabb64dabe5c12c226fa8627abd when 'openstack-base' container built with 'pycadf' plugin from git. Closes-Bug: #2107733 Related-Bug: #2074075 Change-Id: I7944c59d1bb83d42631c3d0ecc14aa8e25ce620e Signed-off-by: Maksim Malchuk <[email protected]> (cherry picked from commit 3ef7072)
1 parent 0bb6a65 commit ca00700

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docker/openstack-base/Dockerfile.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
135135
'pika',
136136
'prettytable',
137137
'psutil',
138-
'/plugins/pycadf*',
138+
'/plugins/*pycadf*',
139139
'pyinotify',
140140
'pymysql',
141141
'pyngus',
@@ -185,7 +185,7 @@ ADD openstack-base-archive /openstack-base-source
185185
ADD plugins-archive /
186186

187187
RUN mkdir -p /etc/pycadf \
188-
&& cp /plugins/pycadf*/etc/pycadf/* /etc/pycadf/
188+
&& cp /plugins/*pycadf*/etc/pycadf/* /etc/pycadf/
189189

190190
RUN ln -s openstack-base-source/* /requirements \
191191

0 commit comments

Comments
 (0)