Merge "[CORD-3015] Upgrade ONOS version to 1.13 in helm-charts"
diff --git a/examples/pull-always-values.yaml b/examples/pull-always-values.yaml
index 4093a81..75a185a 100644
--- a/examples/pull-always-values.yaml
+++ b/examples/pull-always-values.yaml
@@ -32,3 +32,5 @@
imagePullPolicy: 'Always'
kubernetes:
imagePullPolicy: 'Always'
+vrouter:
+ imagePullPolicy: 'Always'
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 9e09b78..9dedb60 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -161,7 +161,7 @@
relationship: tosca.relationships.BelongsToOne
properties:
name: Fabric_ONOS_app
- dependencies: org.onosproject.drivers, org.onosproject.openflow, org.onosproject.netcfghostprovider, org.onosproject.segmentrouting
+ 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:
@@ -244,10 +244,6 @@
properties:
name: vrouter
kind: rcord
- rest_hostname: onos-fabric-ui
- rest_port: 8181
- rest_user: karaf
- rest_pass: karaf
service_dependency#fabric_vrouter:
type: tosca.nodes.ServiceDependency
properties:
diff --git a/xos-services/fabric/templates/_helpers.tpl b/xos-services/fabric/templates/_helpers.tpl
index 07eb3b2..775d2c2 100644
--- a/xos-services/fabric/templates/_helpers.tpl
+++ b/xos-services/fabric/templates/_helpers.tpl
@@ -56,7 +56,6 @@
- Instance
- Tag
- FabricService
- - AddressManagerServiceInstance
dependency_graph: "/opt/xos/synchronizers/fabric/model-deps"
steps_dir: "/opt/xos/synchronizers/fabric/steps"
sys_dir: "/opt/xos/synchronizers/fabric/sys"
diff --git a/xos-services/vrouter/templates/_helpers.tpl b/xos-services/vrouter/templates/_helpers.tpl
index 6f7795c..b5a307c 100644
--- a/xos-services/vrouter/templates/_helpers.tpl
+++ b/xos-services/vrouter/templates/_helpers.tpl
@@ -54,9 +54,8 @@
endpoint: xos-core:50051
required_models:
- VRouterService
- - VRouterDevice
- - VRouterApp
- - VRouterPort
+ - VRouterServiceInstance
+ - VRouterStaticRoute
dependency_graph: "/opt/xos/synchronizers/vrouter/model-deps"
steps_dir: "/opt/xos/synchronizers/vrouter/steps"
sys_dir: "/opt/xos/synchronizers/vrouter/sys"