From c139ac59163dec120fb57b78ae19b5bce7237d30 Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Wed, 5 Feb 2020 16:31:06 -0600
Subject: Add ssh clients to Ironic Conductor container

Adds ssh clients to Ironic Conductor container for
ansible deploy interface.

Change-Id: Ib995c6ebe5ee76ee1a39e4b5918a79bd61b87a01
Closes-Bug: #1862079
(cherry picked from commit 7234e8b2f72275c85caa146a6d9e49d1ab8281b7)
---
 docker/ironic/ironic-conductor/Dockerfile.j2                         | 4 ++++
 .../add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml    | 5 +++++
 2 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index ba62c50ec..1a4a41eb6 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',
@@ -67,6 +68,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'gdisk',
             'ipmitool',
             'ironic-conductor',
+            'openssh-client',
             'parted',
             'psmisc',
             'python3-ironic-inspector-client',
@@ -88,6 +90,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'fuse',
             'gdisk',
             'ipmitool',
+            'openssh-clients',
             'parted',
             'psmisc',
             'qemu-img-ev',
@@ -111,6 +114,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.
-- 
cgit v1.2.3