diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-21 12:48:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-21 12:48:49 +0000 |
| commit | 03eb40bc1b917af851eeb2a46f9aa58052d35e0b (patch) | |
| tree | 07b74b3ae4bd890b0b270783e4d858e2e5a9dfb1 | |
| parent | a7f0cd9349c487f230041b419451ab0f210d1db5 (diff) | |
| parent | b13e8ec3158b5cbeffcfe2fbc9810d531fd1109d (diff) | |
| download | kolla-03eb40bc1b917af851eeb2a46f9aa58052d35e0b.tar.gz kolla-03eb40bc1b917af851eeb2a46f9aa58052d35e0b.zip | |
Merge "Use virtual package for ansible"
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 811a8102d..b24ab79db 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -9,7 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} # TODO(Jeffrey4l): no python-oneviewclient {% set ironic_conductor_packages = [ - 'ansible', 'dosfstools', 'e2fsprogs', 'gdisk', @@ -25,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if distro_python_version.startswith('3') %} {% set ironic_conductor_packages = ironic_conductor_packages + [ - 'ansible-python3', + 'python3dist\(ansible\)', 'python3-dracclient', 'python3-ironic-inspector-client', 'python3-proliantutils', @@ -36,6 +35,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% else %} {% set ironic_conductor_packages = ironic_conductor_packages + [ + 'ansible', 'pysnmp', 'python-UcsSdk', 'python-dracclient', |