summaryrefslogtreecommitdiffstats
path: root/xci
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2017-10-03 17:18:48 +0200
committerManuel Buil <mbuil@suse.com>2017-10-04 16:18:08 +0000
commit7d9b9d5c0189337e1103ea5f06f744fa0fe013d3 (patch)
tree70dbecbc6edf376b8e9cdfd910b3ca1af1d0cdc2 /xci
parent21a82ce0689793f85777ea1be65c8c068f0dabd4 (diff)
Install docker-py when running xci as part of CI
docker-py package is required by the docker_container module in ansible: http://docs.ansible.com/ansible/latest/docker_container_module.html#docker-container Change-Id: Ib051ae09c84cfa973ef814852e78626499471d0f Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'xci')
-rw-r--r--xci/playbooks/configure-opnfvhost.yml10
-rw-r--r--xci/var/opnfv.yml8
2 files changed, 12 insertions, 6 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index 7b168498..daaddfbd 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -137,15 +137,13 @@
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
+ - name: install opnfv required packages
package:
- name: "{{ docker_package_name }}"
+ name: "{{ opnfv_required_packages }}"
state: latest
- when: lookup('env', 'JENKINS_HOME') != ""
- - name: install python-openstackclient
+ - name: install opnfv required pip packages
pip:
- name: python-openstackclient
+ name: "{{ opnfv_required_pip }}"
state: present
- hosts: localhost
diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index c6c74c87..b1a897f9 100644
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -32,3 +32,11 @@ OPNFV_HOST_IP: "{{ lookup('env','OPNFV_HOST_IP') }}"
OPNFV_SSH_HOST_KEYS_PATH: "{{ lookup('env', 'OPNFV_SSH_HOST_KEYS_PATH') }}"
XCI_EXTRA_VARS_PATH: "{{ lookup('env', 'XCI_EXTRA_VARS_PATH') }}"
XCI_SSL_SUBJECT: "{{ lookup('env', 'XCI_SSL_SUBJECT') }}"
+
+# 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
+ - docker-py