commit 80a01801ecba358a8b57a333a727d5e7a5c5a1ec
author Dennis Dmitriev <ddmitriev@mirantis.com> Fri Aug 11 09:49:37 2017 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Fri Aug 11 02:54:55 2017 -0400
tree 11fa756d96ca3ff220743e52d5915417fd062713
parent e15770977ca6871b701cf19c2b45123fd4e05b5f

Use jinja2 include for user-data instead of fuel-devops !include

Direct !include of user-data YAMLs don't allow to pass the
jinja2 context into the loaded user-data.
{{ REPOSITORY_SUITE }} is rendered into spaces for user-data.

Change-Id: I263e1fa6ca106878466cf81692910eff0b6e7569
Reviewed-on: https://review.gerrithub.io/373875
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml

diff --git a/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml b/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
index 46169ea..8f3ea80 100644
--- a/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
+++ b/tcp_tests/templates/virtual-mcp10-contrail/underlay.yaml
@@ -434,8 +434,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include underlay--meta-data.yaml
-                  cloudinit_user_data: !include underlay--user-data1604.yaml
+                  cloudinit_meta_data: *cloudinit_meta_data
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
               interfaces: *all_interfaces
               network_config: *all_network_config
@@ -460,8 +460,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include underlay--meta-data.yaml
-                  cloudinit_user_data: !include underlay--user-data1604.yaml
+                  cloudinit_meta_data: *cloudinit_meta_data
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
               interfaces: *all_interfaces
               network_config: *all_network_config
@@ -486,8 +486,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include underlay--meta-data.yaml
-                  cloudinit_user_data: !include underlay--user-data1604.yaml
+                  cloudinit_meta_data: *cloudinit_meta_data
+                  cloudinit_user_data: *cloudinit_user_data_1604
 
               interfaces: *all_interfaces
               network_config: *all_network_config