From 4718402de22ad3bc2c213381f60634fbf61e0df4 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 17 Nov 2017 13:36:09 +0000 Subject: playbooks: configure-opnfvhost: Be explicit when copying user files The flavors may contain deployment specific user_variables.yml files so we should only copy the generic one in the common tasks and leave the rest for scenarios to copy them if necessary. Change-Id: I39e3e090dc40d4f13bb42028a24e8574e19cf6dd Signed-off-by: Markos Chandras --- xci/playbooks/configure-opnfvhost.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 9a1ac7cf..12fb3a0f 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -76,7 +76,7 @@ - name: copy openstack_user_config.yml shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/openstack_user_config.yml {{OPENSTACK_OSA_ETC_PATH}}" - name: copy all user override files - shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_*.yml {{OPENSTACK_OSA_ETC_PATH}}" + shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_variables.yml {{OPENSTACK_OSA_ETC_PATH}}" - name: copy cinder.yml shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d" - block: -- cgit