diff options
| author | Zuul <zuul@review.opendev.org> | 2026-07-20 10:58:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-07-20 10:58:57 +0000 |
| commit | 6709ee49acf21dc858501e099c5e012b3426b16c (patch) | |
| tree | 8ace5426a69fd6f8bf13f06247a76ac011b3edc3 | |
| parent | cac8a805451839ec05447aabf0258603614bfc78 (diff) | |
| parent | 03bf617cdaf8f88bb685b74f8220036fc00d8271 (diff) | |
| download | kolla-6709ee49acf21dc858501e099c5e012b3426b16c.tar.gz kolla-6709ee49acf21dc858501e099c5e012b3426b16c.zip | |
Merge "ironic: stop using driver-requirements.txt"
| -rw-r--r-- | kolla/docker/ironic/ironic-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/docker/ironic/ironic-conductor/Dockerfile.j2 | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kolla/docker/ironic/ironic-base/Dockerfile.j2 b/kolla/docker/ironic/ironic-base/Dockerfile.j2 index e2f7871f6..39265cf80 100644 --- a/kolla/docker/ironic/ironic-base/Dockerfile.j2 +++ b/kolla/docker/ironic/ironic-base/Dockerfile.j2 @@ -13,7 +13,7 @@ ADD ironic-base-archive /ironic-base-source ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers {% set ironic_base_pip_packages = [ - '/ironic' + '/ironic[ansible,networking-generic-switch]' ] %} COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/kolla/docker/ironic/ironic-conductor/Dockerfile.j2 b/kolla/docker/ironic/ironic-conductor/Dockerfile.j2 index bce981fb0..15a07e4b9 100644 --- a/kolla/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/kolla/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -52,7 +52,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endif %} {% set ironic_conductor_pip_packages = [ - '-r /ironic/driver-requirements.txt', 'ironic-staging-drivers', ] %} |