summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-09-17 23:36:02 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-09-17 23:37:35 +0200
commitf38ae94e8b6fe30d244ce36b7431f39e4472f269 (patch)
tree71a8bfd71181dad8eddb9222979ad6e40ceafa99
parente2ea3110c72884b495721101bb7cdf49c8bf4e52 (diff)
Override ansible role versions only if OSA version is not master
If OSA version is set to master, we should use the role versions directly from upstream to ensure we do not cause issues by the use of wrong role versions. Change-Id: I26005d23944445bf287384f90c7f2e139224ab23 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--xci/playbooks/configure-opnfvhost.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index 5beddcd7..d45c1be8 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -82,6 +82,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: