diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-09-22 16:57:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-22 16:57:40 +0000 |
| commit | 50c132fa9d563f6a4d81938814937da2dfa957ca (patch) | |
| tree | 400f5f9b966e94642067ac5315ce32d127cb5632 /xci | |
| parent | bb7e7efef45d8347c08022c7246d6111887b864d (diff) | |
| parent | 5f5d367247c1b7fd464b92e0748da7f108eb6f7f (diff) | |
Merge "Install docker and shade on opnfv host"
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 12 | ||||
| -rw-r--r-- | xci/var/Debian.yml | 1 | ||||
| -rw-r--r-- | xci/var/RedHat.yml | 1 | ||||
| -rw-r--r-- | xci/var/Suse.yml | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 067a1176..439201ef 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -140,6 +140,18 @@ content: "{{ xci_ssl_key }}" dest: "/etc/ssl/private/xci.key" become: true + # install docker on opnfv host only if we are running as part of CI + - name: install docker + package: + name: "{{ docker_package_name }}" + state: latest + when: lookup('env', 'JENKINS_HOME') != "" + # install shade on opnfv host only if we are running as part of CI + - name: install shade + pip: + name: shade + state: present + when: lookup('env', 'JENKINS_HOME') != "" - hosts: localhost remote_user: root diff --git a/xci/var/Debian.yml b/xci/var/Debian.yml index 33f11059..16bb879b 100644 --- a/xci/var/Debian.yml +++ b/xci/var/Debian.yml @@ -10,3 +10,4 @@ # this is the interface the VM nodes are connected to libvirt network "default" interface: "ens3" python_crypto_package_name: python-crypto +docker_package_name: docker.io diff --git a/xci/var/RedHat.yml b/xci/var/RedHat.yml index eae7d127..bcd6d044 100644 --- a/xci/var/RedHat.yml +++ b/xci/var/RedHat.yml @@ -9,3 +9,4 @@ ############################################################################## # this is placeholder and left blank intentionally to complete later on python_crypto_package_name: python-crypto +docker_package_name: docker diff --git a/xci/var/Suse.yml b/xci/var/Suse.yml index 786a8751..6b4c76ec 100644 --- a/xci/var/Suse.yml +++ b/xci/var/Suse.yml @@ -10,3 +10,4 @@ # this is the interface the VM nodes are connected to libvirt network "default" interface: "eth0" python_crypto_package_name: python-pycrypto +docker_package_name: docker |