summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Messerli <amesserl@rackspace.com>2020-02-05 16:31:06 -0600
committerMark Goddard <mark@stackhpc.com>2020-03-11 13:31:28 +0000
commitc139ac59163dec120fb57b78ae19b5bce7237d30 (patch)
treeb989e2402e1ee89eed3271ac351b1b7cec3ae0bb
parentb12db74f59c5bcb1db03629a5f561186c5d32e8e (diff)
downloadkolla-c139ac59163dec120fb57b78ae19b5bce7237d30.tar.gz
kolla-c139ac59163dec120fb57b78ae19b5bce7237d30.zip
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)
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j24
-rw-r--r--releasenotes/notes/add-openssh-clients-to-ironic-conductor-7275bd65dfe238a6.yaml5
2 files changed, 9 insertions, 0 deletions
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.