[CORD-1673]
Fixes to E-CORD pod deploy
includes #5016/1 and #4402/5
fix pubkey paths
Includes 5038/2
Fix high Logtash CPU usage (backport of part of CORD-1588)
post-China Mobile fixes
Change-Id: I07bf9a54afd803082491e37b3bcfd6557ec32cb7
diff --git a/roles/cord-profile/templates/vnodglobal-service.yaml.j2 b/roles/cord-profile/templates/vnodglobal-service.yaml.j2
index a1b57ff..348f121 100644
--- a/roles/cord-profile/templates/vnodglobal-service.yaml.j2
+++ b/roles/cord-profile/templates/vnodglobal-service.yaml.j2
@@ -9,34 +9,11 @@
topology_template:
node_templates:
- enterpriselocation#onlab:
- type: tosca.nodes.EnterpriseLocation
- requirements:
- properties:
- name: onlab
- cord_site_ip: 127.0.0.1
- cord_site_port: 8181
- cord_site_username: onos
- cord_site_password: rocks
- cord_site_type: onos
-
-
- enterpriselocation#onlab1:
- type: tosca.nodes.EnterpriseLocation
- requirements:
- properties:
- name: onlab1
- cord_site_ip: 127.0.0.2
- cord_site_port: 8181
- cord_site_username: onos
- cord_site_password: rocks
- cord_site_type: onos
-
- onosmodel#onlab:
+ onosmodel#globalONOS:
type: tosca.nodes.OnosModel
requirements:
properties:
- name: onlabT
+ name: globalONOS
onos_ip: 127.0.0.1
onos_port: 8181
onos_username: onos
@@ -81,33 +58,4 @@
ebs: 3200
cir: 2500000
eir: 3200000
- name: platinum
-
- usernetworkinterface#UserNetworkInterface1:
- type: tosca.nodes.UserNetworkInterface
- requirements:
- properties:
- tenant: onlab
- name: uni1
- latlng: [37.973535, -122.531087]
- cpe_id: netconf:192.168.56.10:830/0
-
- usernetworkinterface#UserNetworkInterface2:
- type: tosca.nodes.UserNetworkInterface
- requirements:
- properties:
- tenant: onlab
- name: uni2
- latlng: [37.773972, -122.431297]
- cpe_id: netconf:192.168.56.20:830/0
-
- eline#testeline:
- type: tosca.nodes.ELine
- requirements:
- properties:
- name: testeline
- connect_point_1_id: netconf:192.168.56.10:830/0
- connect_point_2_id: netconf:192.168.56.20:830/0
- vlanids: 100
- cord_site_name: onlabT
- bwp: gold
\ No newline at end of file
+ name: platinum
\ No newline at end of file