diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-22 14:16:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-22 14:16:18 +0000 |
| commit | fc1c3c9b848b28697f842363975ce74027a10f5e (patch) | |
| tree | d59e31f065e71ce6570b11ec6e4e6650aabeb6fb | |
| parent | 08fbdfaadb1cfba8ba46d1970d784bfbabc7e212 (diff) | |
| parent | f38ae94e8b6fe30d244ce36b7431f39e4472f269 (diff) | |
Merge "Override ansible role versions only if OSA version is not master"
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 84c0d827..067a1176 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -102,6 +102,8 @@ shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks" - name: copy OPNFV role requirements shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/ansible-role-requirements.yml {{OPENSTACK_OSA_PATH}}" + when: + - OPENSTACK_OSA_VERSION != "master" - name: bootstrap ansible on opnfv host command: "/bin/bash ./scripts/bootstrap-ansible.sh" args: |