diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-10-05 08:51:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-05 08:51:40 +0000 |
| commit | a934224aed505efe524a9a4c2db3b917e5addfef (patch) | |
| tree | 41038f61b06345acfc2f2f36e459805e113bfa0b /xci | |
| parent | d1864b34391a0965120bbb5162a17abaa6a8e7fc (diff) | |
| parent | 7d9b9d5c0189337e1103ea5f06f744fa0fe013d3 (diff) | |
Merge "Install docker-py when running xci as part of CI"
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 10 | ||||
| -rw-r--r-- | xci/var/opnfv.yml | 8 |
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 |