From c29e36280713aa232a19e0d3612bae0948601837 Mon Sep 17 00:00:00 2001
From: zhihui wu <wu.zhihui1@zte.com.cn>
Date: Tue, 27 Feb 2018 16:03:07 +0800
Subject: Delete the hardcoding parameter "sut_type"
SUT already can be passed from CLI.
Change-Id: I3ff68ebf94ce25dfc0a42964cf1aafc8e58da4b6
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
---
resources/ansible_roles/qtip-generator/defaults/main.yml | 3 ---
resources/ansible_roles/qtip-generator/files/compute/setup.yml | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
(limited to 'resources')
diff --git a/resources/ansible_roles/qtip-generator/defaults/main.yml b/resources/ansible_roles/qtip-generator/defaults/main.yml
index 300dadf0..6665d11f 100644
--- a/resources/ansible_roles/qtip-generator/defaults/main.yml
+++ b/resources/ansible_roles/qtip-generator/defaults/main.yml
@@ -26,6 +26,3 @@ project_template: 'compute'
qtip_package: ../../..
qtip_cache: .qtip-cache
cwd: .
-
-# TODO(zhihui) temporarily hardcode
-sut_type: vnf
\ No newline at end of file
diff --git a/resources/ansible_roles/qtip-generator/files/compute/setup.yml b/resources/ansible_roles/qtip-generator/files/compute/setup.yml
index 10537615..037f5746 100644
--- a/resources/ansible_roles/qtip-generator/files/compute/setup.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/setup.yml
@@ -11,7 +11,7 @@
---
-{% if sut_type == 'vnf' %}
+{% if sut == 'vnf' %}
- hosts: localhost
gather_facts: no
roles:
--
cgit