summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-10-10 08:44:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-10 08:44:34 +0000
commit9bbaa9d219e77b53db8cbbd0df21581790e53f9f (patch)
tree66594fe110acbc199a8162d39b05f81a7c0c3d44
parent08b12e79ef3f9531009f5eea65e01c1aa845a56d (diff)
parentaf1445d0ee2d0cba5ae79e51a78f6df46bde9683 (diff)
Merge "xci: playbooks: configure-opnfvhost: Copy all user_*.yml files"
-rw-r--r--xci/playbooks/configure-opnfvhost.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index daaddfbd..faae623f 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -75,8 +75,8 @@
shell: "/bin/cp -rf {{OPENSTACK_OSA_PATH}}/etc/openstack_deploy {{OPENSTACK_OSA_ETC_PATH}}"
- 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 user_variables.yml
- shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_variables.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}}"
- name: copy cinder.yml
shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d"
# TODO: We need to get rid of this as soon as the issue is fixed upstream