Add tor agents support for OC 4.X version
- added tor agent provisioning
- refactored tor metadata
Change-Id: Ic7c034f647639d037dfa9b9c2c0eac65d4121d19
Related-PROD: PROD-29061
diff --git a/metadata/service/compute/tor/cluster.yml b/metadata/service/compute/tor/cluster.yml
index 5115598..e913cb4 100644
--- a/metadata/service/compute/tor/cluster.yml
+++ b/metadata/service/compute/tor/cluster.yml
@@ -4,13 +4,18 @@
opencontrail:
compute:
tor:
- enabled: true
- bind:
- port: 8086
+ enabled: True
agent:
tor01:
id: 0
- address: ${_param:single_address}
- port: 6632
- ssl:
- enabled: True
+ address: ${_param:cluster_local_address}
+ tor_name: TOR01
+ tor_ip: 127.0.0.1
+ tor_ovs_port: 6640
+ tor_ovs_protocol: tcp
+ http_server_port: 9090
+ tsn_ip: ${_param:cluster_vip_address}
+ tor_tunnel_ip: 127.0.0.1
+ tor_vendor_name: ovs
+ xmpp_auth_enable: False
+ xmpp_dns_auth_enable: False
diff --git a/metadata/service/compute/tor/single.yml b/metadata/service/compute/tor/single.yml
index 969b1ef..dcd4e80 100644
--- a/metadata/service/compute/tor/single.yml
+++ b/metadata/service/compute/tor/single.yml
@@ -4,12 +4,18 @@
opencontrail:
compute:
tor:
- enabled: true
- bind:
- port: 8086
+ enabled: True
agent:
tor01:
id: 0
- port: 6632
- host: ${_param:tor_device01_address}
address: ${_param:single_address}
+ tor_name: TOR01
+ tor_ip: 127.0.0.1
+ tor_ovs_port: 6640
+ tor_ovs_protocol: tcp
+ http_server_port: 9090
+ tsn_ip: ${_param:single_address}
+ tor_tunnel_ip: 127.0.0.1
+ tor_vendor_name: ovs
+ xmpp_auth_enable: False
+ xmpp_dns_auth_enable: False