diff --git "a/\173\043 roles \043\175/openstack_baremetal" "b/\173\043 roles \043\175/openstack_baremetal"
index 2478a2f..f6739e4 100644
--- "a/\173\043 roles \043\175/openstack_baremetal"
+++ "b/\173\043 roles \043\175/openstack_baremetal"
@@ -7,6 +7,6 @@
           classes:
 #}
           - cluster.${_param:cluster_name}.openstack.baremetal
-{{- set_param('keepalived_vip_interface', 'br_baremetal') }}
+{{- set_param('keepalived_vip_interface', 'br_ctl') }}
 {{- register_metaparam('keepalived_vip_priority', 'openstack_baremetal') }}
 {{- register_metaparam('keepalived_vip_virtual_router_id', 'openstack_baremetal') }}
\ No newline at end of file
diff --git "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml" "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
index af76a1c..d118f2f 100644
--- "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
@@ -6,13 +6,17 @@
 {%- if default_context.get('barbican_enabled', 'False') == 'True' and default_context.get('barbican_integration_enabled', 'False') == 'True' %}
 - service.runtest.tempest.barbican
 {%- endif %}
+{%- if default_context.get('opencontrail_enabled', 'False') == 'True' %}
+- system.neutron.client.service.contrail_public_v2
+{%- endif %}
 parameters:
   _param:
     image_host: http://172.19.112.216:8099
     glance_image_cirros_location: ${_param:image_host}/cirros-0.4.0-x86_64-disk.img
     glance_image_fedora_location: ${_param:image_host}/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
     glance_image_manila_location: ${_param:image_host}/manila-service-image-master.qcow2
-    tempest_test_target: gtw01*
+    glance_image_cirros_name: 'TestCirros-0.4.0'
+    tempest_test_target: cfg01*
     runtest_tempest_cfg_dir: /tmp/test
     runtest_tempest_cfg_name: tempest.conf
   runtest:
@@ -22,4 +26,4 @@
       cfg_dir: ${_param:runtest_tempest_cfg_dir}
       cfg_name: ${_param:runtest_tempest_cfg_name}
       put_keystone_rc_enabled: True
-      put_local_image_file_enabled: True
\ No newline at end of file
+      put_local_image_file_enabled: True
diff --git "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml" "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
index d118f2f..3d01181 100644
--- "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
@@ -9,6 +9,7 @@
 {%- if default_context.get('opencontrail_enabled', 'False') == 'True' %}
 - system.neutron.client.service.contrail_public_v2
 {%- endif %}
+- service.runtest.tempest.tempest_net
 parameters:
   _param:
     image_host: http://172.19.112.216:8099