diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-02-20 15:56:36 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-02-20 15:56:36 +0800 |
| commit | 846203d81dd3fa4bea96391bb99f662f20ba262a (patch) | |
| tree | 53e32877f116f2fde57d30eb27d5b78ff0782595 /docker | |
| parent | ae4318ff0c2ed302708f3b998a63c3fc0356849f (diff) | |
| download | kolla-846203d81dd3fa4bea96391bb99f662f20ba262a.tar.gz kolla-846203d81dd3fa4bea96391bb99f662f20ba262a.zip | |
Install shellinabox and socat packages in ironic
These packages are needed by ironic console.
Change-Id: Ieff5142935fb55cc9860d6cd4f195da095a01449
Closes-Bug: #1666131
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 5841c3901..00c7a83cd 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 %} RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt -r /ironic/driver-requirements.txt |
