diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-12 19:25:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-12 19:25:30 +0000 |
| commit | 3470dc8199f36b2956b75bb2720cd73d207d8701 (patch) | |
| tree | c747eb33dc5088162d8830e2d51e61714e30566d | |
| parent | 9f35bc0690e39fa24b29d3f451000bcdd6d59135 (diff) | |
| parent | 158d998e4e31e45b7b9645c26c0c26e10f1ffb5c (diff) | |
| download | kolla-3470dc8199f36b2956b75bb2720cd73d207d8701.tar.gz kolla-3470dc8199f36b2956b75bb2720cd73d207d8701.zip | |
Merge "Add ssh clients to Ironic Conductor container" into stable/train
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 8df44e618..81460e581 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -13,6 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'e2fsprogs', 'gdisk', 'ipmitool', + 'openssh-clients', 'openstack-ironic-conductor', 'openstack-ironic-staging-drivers', 'parted', @@ -69,6 +70,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'gdisk', 'ipmitool', 'ironic-conductor', + 'openssh-client', 'parted', 'psmisc', 'python3-ironic-inspector-client', @@ -90,6 +92,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'fuse', 'gdisk', 'ipmitool', + 'openssh-clients', 'parted', 'psmisc', 'util-linux', @@ -123,6 +126,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'e2fsprogs', 'gdisk', 'ipmitool', + 'openssh-client', 'parted', 'psmisc', 'qemu-utils', diff --git a/releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml b/releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml new file mode 100644 index 000000000..d7d1fef2f --- /dev/null +++ b/releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Adds openssh-clients to ironic conductor container build to enable + ansible deploy interface to function properly. |