CORD-2685 Rename xos_new_tosca_config_templates -> xos_tosca_config_templates

Change-Id: I7234d62e365f9cb9fad5b4ba9a06b940df14075a
diff --git a/roles/xos-config/tasks/main.yml b/roles/xos-config/tasks/main.yml
index daa9d52..8c8ee38 100644
--- a/roles/xos-config/tasks/main.yml
+++ b/roles/xos-config/tasks/main.yml
@@ -61,4 +61,4 @@
   until: result | success
   retries: 50
   delay: 5
-  with_items: "{{ xos_new_tosca_config_templates }}"
+  with_items: "{{ xos_tosca_config_templates + xos_new_tosca_config_templates }}"