Merge "Activate by default drivers, openflow-base and lldpprovider in ONOS fabric"
diff --git a/voltha/requirements.yaml b/voltha/requirements.yaml
index cef6629..c3a9621 100644
--- a/voltha/requirements.yaml
+++ b/voltha/requirements.yaml
@@ -14,7 +14,7 @@
dependencies:
- name: etcd-operator
- version: 0.8.0
+ version: 0.7.7
repository: https://kubernetes-charts.storage.googleapis.com/
condition: etcd.operator.enabled
- name: consul
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index bc4f720..b65ed20 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -41,30 +41,4 @@
- "--ponsim-comm=grpc"
{{- end }}
-{{- define "xos-core.initial_data" }}
-- model: core.Site
- fields:
- name: {{ .Values.cordSiteName | quote }}
- abbreviated_name: {{ .Values.cordSiteName | quote }}
- login_base: {{ .Values.cordSiteName | quote }}
- site_url: "http://opencord.org/"
- hosts_nodes: true
-
-- model: core.User
- fields:
- email: {{ .Values.xosAdminUser | quote }}
- password: {{ .Values.xosAdminPassword | quote }}
- firstname: {{ .Values.xosAdminFirstname | quote }}
- lastname: {{ .Values.xosAdminLastname | quote }}
- is_admin: true
- relations:
- site:
- fields:
- name: {{ .Values.cordSiteName | quote }}
- model: core.Site
-{{- end }}
-
-{{- define "xos-core.ca_cert_chain" }}
-{{ .Values.ca_cert_chain | b64dec }}
-{{- end }}
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index 27bb698..6ac4849 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -116,6 +116,7 @@
type: tosca.nodes.ONOSApp
properties:
name: cord-config
+ app_id: org.opencord.cord-config
url: {{ .cordConfigAppURL }}
version: 1.4.0
dependencies: org.onosproject.openflow, org.onosproject.dhcp
@@ -128,6 +129,7 @@
type: tosca.nodes.ONOSApp
properties:
name: vtn
+ app_id: org.opencord.vtn
url: {{ .vtnAppURL }}
version: 1.6.0
requirements: