summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-11-17 13:36:09 +0000
committerMarkos Chandras <mchandras@suse.de>2017-11-17 13:36:49 +0000
commit4718402de22ad3bc2c213381f60634fbf61e0df4 (patch)
tree402ca5b2407ca5fdf084e4e18b7b7a81283b384c
parent54afc4c3a060793d68b362584a7ab0788ff53617 (diff)
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 <mchandras@suse.de>
-rw-r--r--xci/playbooks/configure-opnfvhost.yml2
1 files changed, 1 insertions, 1 deletions
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: