From dc0fee7c092df7c2c1ff7627e33107969b46c6d2 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 9 Mar 2018 09:17:16 +0000 Subject: xci: Move functest required packages to the functest role The docker packages that we install in the OPNFV VM are needed by functest so add them to the related role. Change-Id: I6ebe76fd030859f757d41ecf20c30ab76888ee9c Signed-off-by: Markos Chandras --- xci/var/Debian.yml | 2 -- xci/var/RedHat.yml | 2 -- xci/var/Suse.yml | 2 -- xci/var/opnfv.yml | 9 --------- 4 files changed, 15 deletions(-) (limited to 'xci/var') diff --git a/xci/var/Debian.yml b/xci/var/Debian.yml index ad3621b6..c785c65c 100644 --- a/xci/var/Debian.yml +++ b/xci/var/Debian.yml @@ -9,5 +9,3 @@ ############################################################################## # this is the interface the VM nodes are connected to libvirt network "default" python_crypto_package_name: python-crypto -docker_package_name: docker.io -docker_service_name: docker diff --git a/xci/var/RedHat.yml b/xci/var/RedHat.yml index 8ea2e15a..eae7d127 100644 --- a/xci/var/RedHat.yml +++ b/xci/var/RedHat.yml @@ -9,5 +9,3 @@ ############################################################################## # this is placeholder and left blank intentionally to complete later on python_crypto_package_name: python-crypto -docker_package_name: docker -docker_service_name: docker diff --git a/xci/var/Suse.yml b/xci/var/Suse.yml index 5066defa..5891aee9 100644 --- a/xci/var/Suse.yml +++ b/xci/var/Suse.yml @@ -9,5 +9,3 @@ ############################################################################## # this is the interface the VM nodes are connected to libvirt network "default" python_crypto_package_name: python-pycrypto -docker_package_name: docker -docker_service_name: docker diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index d3924bf0..f438e577 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -43,12 +43,3 @@ OPENSTACK_OSA_HAPROXY_GIT_URL: "{{ lookup('env','OPENSTACK_OSA_HAPROXY_GIT_URL') HAPROXY_VERSION: "{{ lookup('env','HAPROXY_VERSION') }}" KEEPALIVED_GIT_URL: "{{ lookup('env','KEEPALIVED_GIT_URL') }}" KEEPALIVED_VERSION: "{{ lookup('env','KEEPALIVED_VERSION') }}" - -# install docker on opnfv host only if we are running as part of CI -opnfv_required_packages: - - "{{ docker_package_name }}" - -opnfv_required_pip: - - python-openstackclient - - python-neutronclient - - docker-py -- cgit 1.2.3-korg