refactor TSN

Change-Id: I353ba2b6c64398ab48d8801ebd25b63442471092
diff --git a/metadata/service/compute/tor/cluster.yml b/metadata/service/compute/tor/cluster.yml
new file mode 100644
index 0000000..5115598
--- /dev/null
+++ b/metadata/service/compute/tor/cluster.yml
@@ -0,0 +1,16 @@
+applications:
+- opencontrail
+parameters:
+  opencontrail:
+    compute:
+      tor:
+        enabled: true
+        bind:
+          port: 8086
+        agent:
+          tor01:
+            id: 0
+            address: ${_param:single_address}
+            port: 6632
+            ssl:
+              enabled: True
diff --git a/metadata/service/compute/tor/single.yml b/metadata/service/compute/tor/single.yml
new file mode 100644
index 0000000..969b1ef
--- /dev/null
+++ b/metadata/service/compute/tor/single.yml
@@ -0,0 +1,15 @@
+applications:
+- opencontrail
+parameters:
+  opencontrail:
+    compute:
+      tor:
+        enabled: true
+        bind:
+          port: 8086
+        agent:
+          tor01:
+            id: 0
+            port: 6632
+            host: ${_param:tor_device01_address}
+            address: ${_param:single_address}
diff --git a/metadata/service/tor/single.yml b/metadata/service/tor/single.yml
deleted file mode 100644
index 7dc070c..0000000
--- a/metadata/service/tor/single.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-applications:
-- opencontrail
-parameters:
-  _param:
-    opencontrail_version: 2.2
-    opencontrail_tor_agents: 1
-  opencontrail:
-    common:
-      version: ${_param:opencontrail_version}
-      identity:
-        engine: keystone
-        host: 127.0.0.1
-        port: 35357
-        token: token
-        password: password
-      network:
-        engine: neutron
-        host: 127.0.0.1
-        port: 9696
-    tor:
-      enabled: true
-      version: ${_param:opencontrail_version}
-      agents: ${_param:opencontrail_tor_agents}
-      control:
-        address: ${_param:single_address}
-      interface:
-        address: ${_param:single_address}
-      device:
-        host: ${_param:tor_device_address}
\ No newline at end of file