commit 1f236a8604646de366c1a7640c104edba5d3a6b2
author Dennis Dmitriev <ddmitriev@mirantis.com> Fri May 26 16:26:09 2017 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Fri May 26 09:29:19 2017 -0400
tree 6eddb70eb17c2ce3473370debce70421e4c10d1e
parent 2fd0ec649ff2683c21cccc919c968e4a01a9d687

Fix reclass adapter before restarting salt-master

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

tcp_tests/templates/physical_mcp11_dvr/underlay.yaml

diff --git a/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml b/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
index cd08c85..debafdf 100644
--- a/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
+++ b/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
@@ -10,7 +10,7 @@
  - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
  - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
  - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
- - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
+ - &cloudinit_user_data {{ CLOUDINIT_USER_DATA_1604 }}
 
 {% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'physical_mcp11_dvr') + '.local' %}
 {% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
@@ -134,7 +134,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -184,7 +184,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -233,7 +233,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -283,7 +283,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -333,7 +333,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -383,7 +383,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0
@@ -432,7 +432,7 @@
                              # for store image with cloud-init metadata.
 
                   cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
+                  cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
                 - label: eth0