Merge "[COMAC-96] Change k8s and tosca configs to use the latest XOS chart"
diff --git a/kubernetes-configs/mcord-release-cluster.yml b/kubernetes-configs/mcord-release-cluster.yml
index 84d480a..7ff8615 100644
--- a/kubernetes-configs/mcord-release-cluster.yml
+++ b/kubernetes-configs/mcord-release-cluster.yml
@@ -1,10 +1,4 @@
---
-xos-gui:
- images:
- xos_gui:
- repository: 'matteoscandolo/xos-gui'
- tag: "mwc"
-
log_agent:
enabled: false
diff --git a/tosca-configs/mcord/mcord-release-cluster-fabric.yaml b/tosca-configs/mcord/mcord-release-cluster-fabric.yaml
index 8692f45..59d1059 100644
--- a/tosca-configs/mcord/mcord-release-cluster-fabric.yaml
+++ b/tosca-configs/mcord/mcord-release-cluster-fabric.yaml
@@ -21,8 +21,6 @@
- custom_types/portinterface.yaml
- custom_types/fabricipaddress.yaml
- custom_types/site.yaml
- - custom_types/deployment.yaml
- - custom_types/sitedeployment.yaml
- custom_types/node.yaml
- custom_types/vrouterservice.yaml
- custom_types/vrouterserviceinstance.yaml
@@ -42,21 +40,6 @@
site_url: http://opencord.org/
hosts_nodes: true
- myDeployment:
- type: tosca.nodes.Deployment
- properties:
- name: mydeployment
-
- site_deployment:
- type: tosca.nodes.SiteDeployment
- requirements:
- - site:
- node: mySite
- relationship: tosca.relationships.BelongsToOne
- - deployment:
- node: myDeployment
- relationship: tosca.relationships.BelongsToOne
-
# compute nodes
node#node1:
type: tosca.nodes.Node
@@ -64,10 +47,6 @@
dataPlaneIntf: eth2
dataPlaneIp: 118.0.0.201
name: node1
- requirements:
- - site_deployment:
- node: site_deployment
- relationship: tosca.relationships.BelongsToOne
node#node2:
type: tosca.nodes.Node
@@ -75,10 +54,6 @@
dataPlaneIntf: eth2
dataPlaneIp: 118.0.0.202
name: node2
- requirements:
- - site_deployment:
- node: site_deployment
- relationship: tosca.relationships.BelongsToOne
# static routes
service#vrouter: