aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-02-07 14:02:40 +0000
committerGerrit Code Review <review@openstack.org>2020-02-07 14:02:40 +0000
commit8a01ad3186785abb564b234b30c0a35b1d389d0d (patch)
treec036152c41e08a2d06e391f113b5c456c4b0f734
parentc864b8c6a62561b136eb2dec61fc58efc44fcac5 (diff)
parent7234e8b2f72275c85caa146a6d9e49d1ab8281b7 (diff)
downloadkolla-8a01ad3186785abb564b234b30c0a35b1d389d0d.tar.gz
kolla-8a01ad3186785abb564b234b30c0a35b1d389d0d.zip
Merge "Add ssh clients to Ironic Conductor container"
-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 e5319e069..943cd206c 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'e2fsprogs',
'gdisk',
'ipmitool',
+ 'openssh-clients',
'openstack-ironic-conductor',
'openstack-ironic-staging-drivers',
'parted',
@@ -71,6 +72,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'gdisk',
'ipmitool',
'ironic-conductor',
+ 'openssh-client',
'parted',
'psmisc',
'python3-ironic-inspector-client',
@@ -92,6 +94,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'fuse',
'gdisk',
'ipmitool',
+ 'openssh-clients',
'parted',
'psmisc',
'util-linux',
@@ -127,6 +130,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'e2fsprogs',
'gdisk',
'ipmitool',
+ 'openssh-client',
'parted',
'psmisc',
'python3-systemd',
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.