diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-23 15:34:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-23 15:34:36 +0000 |
| commit | 0908d946b32e5b134fab4eb0e119d8bf9661c902 (patch) | |
| tree | 6e38d7fed392992b548c43b6e2473ccfe3a84eba /ci/deploy.sh | |
| parent | 81b3142363d36b5328906e084262a723dcdf2fda (diff) | |
| parent | 10a751f1e43a1c719ad4f313fb8059847de6190a (diff) | |
Merge changes from topic 'docker-build'
* changes:
[docker build] Install OpenSSH server
[submodule] Add docker-salt-formulas, ci/build.sh
[deploy.sh] Install Docker if not present
[jump req] Add build/deploy specific requirements
Diffstat (limited to 'ci/deploy.sh')
| -rwxr-xr-x | ci/deploy.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index ea8524a85..47662f796 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -240,7 +240,8 @@ if [ ${USE_EXISTING_PKGS} -eq 1 ]; then notify "[NOTE] Skipping distro pkg installation" 2 else notify "[NOTE] Installing required distro pkgs" 2 - jumpserver_pkg_install + jumpserver_pkg_install 'deploy' + docker_install fi if ! virsh list >/dev/null 2>&1; then |