commit d6144ee75e99108ccca4ab29cd7f28ac50f31970
author Andy Bavier <andy@onlab.us> Thu Feb 01 15:58:06 2018 -0700
committer Andy Bavier <andy@opennetworking.org> Fri Feb 02 03:06:47 2018 +0000
tree 9a58c6772274fc92a66363ff73903e9bab491d32
parent 34d0a044649bab5c0e83a7519f7efd6fd753144b

CORD-2685 Rename xos_new_tosca_config_templates -> xos_tosca_config_templates

Change-Id: I7234d62e365f9cb9fad5b4ba9a06b940df14075a

roles/xos-config/defaults/main.yml

diff --git a/roles/xos-config/defaults/main.yml b/roles/xos-config/defaults/main.yml
index afe9481..55a0062 100644
--- a/roles/xos-config/defaults/main.yml
+++ b/roles/xos-config/defaults/main.yml
@@ -25,7 +25,6 @@
 head_xos_admin_pass: "{{ lookup('file', head_credentials_dir ~ '/' ~ xos_admin_user) }}"
 
 xos_tosca_config_templates: []
-
-xos_new_tosca_config_templates: []
+xos_new_tosca_config_templates: [] # Deprecated
 
 use_openstack: True

roles/xos-config/tasks/main.yml

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 }}"