Merge "CORD-3135 Remove kubernetes-service from rcord-lite profile"
diff --git a/xos-profiles/base-kubernetes/requirements.yaml b/xos-profiles/base-kubernetes/requirements.yaml
index 928424a..2f9fb87 100644
--- a/xos-profiles/base-kubernetes/requirements.yaml
+++ b/xos-profiles/base-kubernetes/requirements.yaml
@@ -15,24 +15,6 @@
# limitations under the License.
dependencies:
-- name: rcord
- version: 0.1.0
- repository: file://../../xos-services/rcord
-- name: onos-service
- version: 0.1.0
- repository: file://../../xos-services/onos-service
-- name: fabric
- version: 0.1.0
- repository: file://../../xos-services/fabric
-- name: volt
- version: 0.1.0
- repository: file://../../xos-services/volt
-- name: vsg-hw
- version: 0.1.0
- repository: file://../../xos-services/vsg-hw
-- name: vrouter
- version: 0.1.0
- repository: file://../../xos-services/vrouter
- name: kubernetes
version: 0.1.0
repository: file://../../xos-services/kubernetes
diff --git a/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml b/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
index b8c4fab..607a676 100644
--- a/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
+++ b/xos-profiles/base-kubernetes/templates/tosca-configmap.yaml
@@ -23,8 +23,6 @@
{{ toYaml .Values.toscaRecipes.fixtures | indent 4 }}
020-deployment.yaml: |
{{ toYaml .Values.toscaRecipes.deployment | indent 4 }}
- 030-fabric-service.yaml: |
-{{ toYaml .Values.toscaRecipes.fabricService | indent 4 }}
040-cord-services.yaml: |
{{ toYaml .Values.toscaRecipes.cordServices | indent 4 }}
050-service-graph-constraints.yaml: |
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index 0fcd2bb..15b7d6c 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -128,74 +128,11 @@
properties:
name: MyDeployment
- fabricService:
- tosca_definitions_version: tosca_simple_yaml_1_0
- imports:
- - custom_types/fabricservice.yaml
- - custom_types/onosapp.yaml
- - custom_types/onosservice.yaml
- - custom_types/serviceattribute.yaml
- - custom_types/servicedependency.yaml
- - custom_types/serviceinstancelink.yaml
- description: fabric services, generated by rcord profile
- topology_template:
- node_templates:
- service#ONOS_Fabric:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_Fabric
- kind: platform
- no_container: true
- rest_hostname: onos-fabric-ui
- rest_port: 8181
- service#fabric:
- type: tosca.nodes.FabricService
- properties:
- name: fabric
- kind: platform
- Fabric_ONOS_app:
- type: tosca.nodes.ONOSApp
- requirements:
- - owner:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
- properties:
- name: Fabric_ONOS_app
- dependencies: org.onosproject.drivers, org.onosproject.openflow, org.onosproject.netcfghostprovider, org.onosproject.segmentrouting, org.onosproject.vrouter
- service_dependency#onos-fabric_fabric:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#fabric
- relationship: tosca.relationships.BelongsToOne
-
cordServices:
tosca_definitions_version: tosca_simple_yaml_1_0
- description: Set up VOLT, AddressManager, and RCORD services
+ description: Set up Kubernetes Service
imports:
- - custom_types/fabricservice.yaml
- - custom_types/image.yaml
- custom_types/kubernetesservice.yaml
- - custom_types/network.yaml
- - custom_types/networkslice.yaml
- - custom_types/networktemplate.yaml
- - custom_types/nodelabel.yaml
- - custom_types/onosapp.yaml
- - custom_types/onosservice.yaml
- - custom_types/site.yaml
- - custom_types/service.yaml
- - custom_types/servicedependency.yaml
- - custom_types/serviceinstanceattribute.yaml
- - custom_types/serviceinstancelink.yaml
- - custom_types/slice.yaml
- - custom_types/voltservice.yaml
- - custom_types/vrouterservice.yaml
- - custom_types/vsghwservice.yaml
- custom_types/trustdomain.yaml
topology_template:
node_templates:
@@ -207,87 +144,10 @@
- owner:
node: service#kubernetes
relationship: tosca.relationships.BelongsToOne
- service#ONOS_Fabric:
- type: tosca.nodes.ONOSService
- properties:
- name: ONOS_Fabric
- must-exist: true
- service#fabric:
- type: tosca.nodes.FabricService
- properties:
- name: fabric
- must-exist: true
- service#rcord:
- type: tosca.nodes.Service
- properties:
- name: rcord
- rcord_volt:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#rcord
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
service#kubernetes:
type: tosca.nodes.KubernetesService
properties:
name: kubernetes
- service#volt:
- type: tosca.nodes.VOLTService
- properties:
- name: volt
- voltha_url: voltha.voltha.svc.cluster.local
- voltha_port: 8882
- onos_voltha_url: onos-voltha-ui.voltha.svc.cluster.local
- onos_voltha_port: 8181
- onos_voltha_user: karaf
- onos_voltha_pass: karaf
- service#vsg-hw:
- type: tosca.nodes.VSGHWService
- properties:
- name: vsg-hw
- service#vrouter:
- type: tosca.nodes.VRouterService
- properties:
- name: vrouter
- kind: rcord
- service_dependency#fabric_vrouter:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#fabric
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#vrouter
- relationship: tosca.relationships.BelongsToOne
- volt_vsg-hw:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#volt
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#vsg-hw
- relationship: tosca.relationships.BelongsToOne
- onos_fabric_vsg-hw:
- type: tosca.nodes.ServiceDependency
- properties:
- connect_method: None
- requirements:
- - subscriber_service:
- node: service#vsg-hw
- relationship: tosca.relationships.BelongsToOne
- - provider_service:
- node: service#ONOS_Fabric
- relationship: tosca.relationships.BelongsToOne
serviceGraphConstraints:
tosca_definitions_version: tosca_simple_yaml_1_0
@@ -299,4 +159,4 @@
constraints:
type: tosca.nodes.ServiceGraphConstraint
properties:
- constraints: '[[null, "rcord"], [null, "volt"], ["ONOS_Fabric", "vsg-hw"], ["fabric", null], ["vrouter", null]]'
+ constraints: '[]'