diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-21 07:35:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-21 07:35:24 +0000 |
| commit | 5108cc177c397671c3a4a78a197b77b070001877 (patch) | |
| tree | 996ca7a7808ac9787dce1b27d31f8a59b09fb885 /docker | |
| parent | 213a585ee62fa0d349775303419775bc02eb34d9 (diff) | |
| parent | 846203d81dd3fa4bea96391bb99f662f20ba262a (diff) | |
| download | kolla-5108cc177c397671c3a4a78a197b77b070001877.tar.gz kolla-5108cc177c397671c3a4a78a197b77b070001877.zip | |
Merge "Install shellinabox and socat packages in ironic"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 6da367427..c7fbdbc52 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -25,7 +25,9 @@ MAINTAINER {{ maintainer }} 'pysnmp', 'python-UcsSdk', 'openwsman-python', - 'python2-ImcSdk' + 'python2-ImcSdk', + 'shellinabox', + 'socat' ] %} {% elif base_distro in ['ubuntu'] %} # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk, @@ -45,7 +47,9 @@ MAINTAINER {{ maintainer }} 'python-pysnmp4', 'python-scciclient', 'python-seamicroclient', - 'python-openwsman' + 'python-openwsman', + 'shellinabox', + 'socat' ] %} {% endif %} {% elif install_type == 'source' %} @@ -58,7 +62,9 @@ MAINTAINER {{ maintainer }} 'parted', 'gdisk', 'psmisc', - 'fuse' + 'fuse', + 'shellinabox', + 'socat' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set ironic_conductor_packages = [ @@ -68,7 +74,9 @@ MAINTAINER {{ maintainer }} 'ipmitool', 'gdisk', 'psmisc', - 'parted' + 'parted', + 'shellinabox', + 'socat' ] %} {% endif %} |