openstack
/
kolla
Code Issues Proposed changes

Merge "Install shellinabox and socat packages in ironic"

This commit is contained in:
Jenkins 2017-02-21 07:35:24 +00:00 committed by Gerrit Code Review
parent 213a585ee6 846203d81d
commit 5108cc177c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -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 %}