diff --git a/configs/onos-fabric.yaml b/configs/onos-fabric.yaml
index ccdafce..8115b1d 100644
--- a/configs/onos-fabric.yaml
+++ b/configs/onos-fabric.yaml
@@ -19,7 +19,10 @@
 # helm install -f configs/onos-fabric.yaml onos
 
 services:
-  serviceType: NodePort
+  openflowServiceType: NodePort
+  ovsdbServiceType: NodePort
+  sshServiceType: NodePort
+  uiServiceType: NodePort
   ovsdb:
     nodePort: 31640
   openflow:
diff --git a/configs/onos-voltha.yaml b/configs/onos-voltha.yaml
new file mode 100644
index 0000000..2bce674
--- /dev/null
+++ b/configs/onos-voltha.yaml
@@ -0,0 +1,51 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Expose ONOS services using NodePorts, for onos-voltha configuration
+#
+# helm install -f configs/onos-voltha.yaml onos
+nameOverride: "onosv"
+fullnameOverride: "onos-voltha"
+
+namespace: voltha
+serviceAccountName: voltha-serviceaccount
+
+image:
+  repository: voltha/voltha-onos
+  tag: 'latest'
+  pullPolicy: IfNotPresent
+
+services:
+  openflowServiceType: ClusterIP
+  ovsdbServiceType: ClusterIP
+  sshServiceType: NodePort
+  uiServiceType: NodePort
+  ssh:
+    nodePort: 30115
+  ui:
+    nodePort: 30120
+
+onos_env:
+- name: POD_IP
+  valueFrom:
+  fieldRef:
+    fieldPath: status.podIP
+- name: NAMESPACE
+  valueFrom:
+  fieldRef:
+    fieldPath: metadata.namespace
+- name: ONOS_APPS
+  value: "drivers,openflow-base"
diff --git a/examples/openstack-compute-tosca.yaml b/examples/openstack-compute-tosca.yaml
new file mode 100644
index 0000000..02951dd
--- /dev/null
+++ b/examples/openstack-compute-tosca.yaml
@@ -0,0 +1,85 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TOSCA recipe for adding a sample R-CORD subscriber
+#
+# http POST $(minikube service xos-tosca --url)/run \
+#  xos-username:admin@opencord.org xos-password:letmein \
+#  @./openstack-compute-tosca.yaml
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - custom_types/deployment.yaml
+  - custom_types/node.yaml
+  - custom_types/site.yaml
+  - custom_types/sitedeployment.yaml
+
+description: Adds OpenStack compute nodes
+
+topology_template:
+  node_templates:
+
+# Site/Deployment, fully defined in deployment.yaml
+    mysite:
+      type: tosca.nodes.Site
+      properties:
+        name: mysite
+        must-exist: true
+
+    MyDeployment:
+      type: tosca.nodes.Deployment
+      properties:
+        name: MyDeployment
+        must-exist: true
+
+# OpenStack compute nodes
+
+    head1:
+      type: tosca.nodes.Node
+      properties:
+        name: head1
+      requirements:
+        - site_deployment:
+            node:  mysite_MyDeployment
+            relationship: tosca.relationships.BelongsToOne
+    compute1:
+      type: tosca.nodes.Node
+      properties:
+        name: compute1
+      requirements:
+        - site_deployment:
+            node:  mysite_MyDeployment
+            relationship: tosca.relationships.BelongsToOne
+    compute2:
+      type: tosca.nodes.Node
+      properties:
+        name: compute2
+      requirements:
+        - site_deployment:
+            node:  mysite_MyDeployment
+            relationship: tosca.relationships.BelongsToOne
+
+    mysite_MyDeployment:
+      type: tosca.nodes.SiteDeployment
+      requirements:
+        - site:
+            node: mysite
+            relationship: tosca.relationships.BelongsToOne
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.BelongsToOne
+
diff --git a/examples/openstack-instance-tosca.yaml b/examples/openstack-instance-tosca.yaml
new file mode 100644
index 0000000..3f2ec6c
--- /dev/null
+++ b/examples/openstack-instance-tosca.yaml
@@ -0,0 +1,91 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TOSCA recipe for adding a sample R-CORD subscriber
+#
+# http POST $(minikube service xos-tosca --url)/run \
+#  xos-username:admin@opencord.org xos-password:letmein \
+#  @./openstack-instance-tosca.yaml
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - custom_types/deployment.yaml
+  - custom_types/flavor.yaml
+  - custom_types/image.yaml
+  - custom_types/node.yaml
+  - custom_types/instance.yaml
+  - custom_types/slice.yaml
+
+description: openstack extensions to deployment
+
+topology_template:
+  node_templates:
+
+# Images and flavors
+    Cirros-0.3.5:
+      type: tosca.nodes.Image
+      properties:
+        name: "Cirros 0.3.5 64-bit"
+        must-exist: true
+
+    m1.tiny:
+      type: tosca.nodes.Flavor
+      properties:
+        name: m1.tiny
+        must-exist: true
+
+    MyDeployment:
+      type: tosca.nodes.Deployment
+      properties:
+        name: MyDeployment
+        must-exist: true
+
+    mysite_test:
+      description: Test Slice
+      type: tosca.nodes.Slice
+      properties:
+        name: mysite_test
+        must-exist: true
+
+    compute1:
+      type: tosca.nodes.Node
+      properties:
+        name: compute1
+        must-exist: true
+
+    test_instance:
+      description: Test Instance
+      type: tosca.nodes.Instance
+      properties:
+        name: test_instance
+      requirements:
+        - image:
+            node: Cirros-0.3.5
+            relationship: tosca.relationships.BelongsToOne
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.BelongsToOne
+        - flavor:
+            node: m1.tiny
+            relationship: tosca.relationships.BelongsToOne
+        - slice:
+            node: mysite_test
+            relationship: tosca.relationships.BelongsToOne
+        - node:
+            node: compute1
+            relationship: tosca.relationships.BelongsToOne
+
diff --git a/examples/openstack-tosca.yaml b/examples/openstack-tosca.yaml
new file mode 100644
index 0000000..a2b8a5b
--- /dev/null
+++ b/examples/openstack-tosca.yaml
@@ -0,0 +1,155 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TOSCA recipe for adding a sample R-CORD subscriber
+#
+# http POST $(minikube service xos-tosca --url)/run \
+#  xos-username:admin@opencord.org xos-password:letmein \
+#  @./openstack-tosca.yaml
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - custom_types/controller.yaml
+  - custom_types/controllersite.yaml
+  - custom_types/deployment.yaml
+  - custom_types/flavor.yaml
+  - custom_types/image.yaml
+  - custom_types/site.yaml
+  - custom_types/networktemplate.yaml
+  - custom_types/network.yaml
+  - custom_types/networkslice.yaml
+  - custom_types/slice.yaml
+  - custom_types/sitedeployment.yaml
+
+description: openstack extensions to deployment
+
+topology_template:
+  node_templates:
+
+# Images and flavors
+    Cirros-0.3.5:
+      type: tosca.nodes.Image
+      properties:
+        name: "Cirros 0.3.5 64-bit"
+        disk_format: QCOW2
+        container_format: BARE
+
+    m1.tiny:
+      type: tosca.nodes.Flavor
+      properties:
+        name: m1.tiny
+
+    m1.small:
+      type: tosca.nodes.Flavor
+      properties:
+        name: m1.small
+
+    m1.medium:
+      type: tosca.nodes.Flavor
+      properties:
+        name: m1.medium
+
+    m1.large:
+      type: tosca.nodes.Flavor
+      properties:
+        name: m1.large
+
+    m1.xlarge:
+      type: tosca.nodes.Flavor
+      properties:
+        name: m1.xlarge
+
+
+    MyDeployment:
+      type: tosca.nodes.Deployment
+      properties:
+        name: MyDeployment
+
+# OpenStack Controller
+    mysite_MyDeployment_openstack:
+      type: tosca.nodes.Controller
+      requirements:
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.BelongsToOne
+      properties:
+          name: mysite_MyDeployment_openstack
+          backend_type: OpenStack
+          version: Newton
+          auth_url: http://keystone.openstack.svc.cluster.local/v3
+          admin_user: admin
+          admin_password: password
+          admin_tenant: admin
+          domain: Default
+
+# Site - adds openstack controller to site defined in deployment.yaml
+    mysite:
+      type: tosca.nodes.Site
+      properties:
+          name: mysite
+          must-exist: true
+          site_url: http://mysite.opencloud.us/
+          hosts_nodes: true
+
+    mysite_deployment_MyDeployment:
+        type: tosca.nodes.SiteDeployment
+        requirements:
+            - site:
+                node: mysite
+                relationship: tosca.relationships.BelongsToOne
+            - deployment:
+                node: MyDeployment
+                relationship: tosca.relationships.BelongsToOne
+            - controller:
+                node: mysite_MyDeployment_openstack
+                relationship: tosca.relationships.BelongsToOne
+
+    mysite_openstack_controller:
+        type: tosca.nodes.ControllerSite
+        requirements:
+            - site:
+                node: mysite
+                relationship: tosca.relationships.BelongsToOne
+            - controller:
+                node: mysite_MyDeployment_openstack
+                relationship: tosca.relationships.BelongsToOne
+
+
+# For creating a test VM
+    mysite_test:
+      description: Test Slice
+      type: tosca.nodes.Slice
+      properties:
+        # network: noauto
+        name: mysite_test
+      requirements:
+        - site:
+            node: mysite
+            relationship: tosca.relationships.BelongsToOne
+        - default_image:
+            node: Cirros-0.3.5
+            relationship: tosca.relationships.BelongsToOne
+
+
+# For private networks (e.g., per-slice)
+    private_template:
+      type: tosca.nodes.NetworkTemplate
+      properties:
+        name: Private
+        visibility: private
+        translation: none
+        vtn_kind: PRIVATE
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index 840dc0a..5d9e343 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -18,6 +18,7 @@
 kind: Deployment
 metadata:
   name: {{ template "onos.fullname" . }}
+  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "onos.name" . }}
     chart: {{ template "onos.chart" . }}
@@ -35,10 +36,14 @@
         app: {{ template "onos.name" . }}
         release: {{ .Release.Name }}
     spec:
+      serviceAccount: {{ .Values.serviceAccountName }}
+      serviceAccountName: {{ .Values.serviceAccountName }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+{{ toYaml .Values.onos_env | indent 12 }}
           ports:
             - name: ovsdb
               containerPort: {{ .Values.services.ovsdb.port }}
diff --git a/onos/templates/openflow-service.yaml b/onos/templates/openflow-service.yaml
index c61f611..05fadeb 100644
--- a/onos/templates/openflow-service.yaml
+++ b/onos/templates/openflow-service.yaml
@@ -16,13 +16,14 @@
 kind: Service
 metadata:
   name: {{ template "onos.fullname" . }}-openflow
+  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "onos.name" . }}
     chart: {{ template "onos.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  type: {{ .Values.services.serviceType }}
+  type: {{ .Values.services.openflowServiceType }}
   ports:
   - name: openflow
 {{ toYaml .Values.services.openflow | indent 4 }}
diff --git a/onos/templates/ovsdb-service.yaml b/onos/templates/ovsdb-service.yaml
index cfda477..f0760fe 100644
--- a/onos/templates/ovsdb-service.yaml
+++ b/onos/templates/ovsdb-service.yaml
@@ -16,13 +16,14 @@
 kind: Service
 metadata:
   name: {{ template "onos.fullname" . }}-ovsdb
+  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "onos.name" . }}
     chart: {{ template "onos.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  type: {{ .Values.services.serviceType }}
+  type: {{ .Values.services.ovsdbServiceType }}
   ports:
   - name: ovsdb
 {{ toYaml .Values.services.ovsdb | indent 4 }}
diff --git a/onos/templates/ssh-service.yaml b/onos/templates/ssh-service.yaml
index fdcbb66..bf0b8a0 100644
--- a/onos/templates/ssh-service.yaml
+++ b/onos/templates/ssh-service.yaml
@@ -16,13 +16,14 @@
 kind: Service
 metadata:
   name: {{ template "onos.fullname" . }}-ssh
+  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "onos.name" . }}
     chart: {{ template "onos.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  type: {{ .Values.services.serviceType }}
+  type: {{ .Values.services.sshServiceType }}
   ports:
   - name: ssh
 {{ toYaml .Values.services.ssh | indent 4 }}
diff --git a/onos/templates/ui-service.yaml b/onos/templates/ui-service.yaml
index 40cbd68..4c05f4d 100644
--- a/onos/templates/ui-service.yaml
+++ b/onos/templates/ui-service.yaml
@@ -16,13 +16,14 @@
 kind: Service
 metadata:
   name: {{ template "onos.fullname" . }}-ui
+  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "onos.name" . }}
     chart: {{ template "onos.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  type: {{ .Values.services.serviceType }}
+  type: {{ .Values.services.uiServiceType }}
   ports:
   - name: ui
 {{ toYaml .Values.services.ui | indent 4 }}
diff --git a/onos/values.yaml b/onos/values.yaml
index 688fff6..c46008f 100644
--- a/onos/values.yaml
+++ b/onos/values.yaml
@@ -28,8 +28,14 @@
 nameOverride: ""
 fullnameOverride: ""
 
+namespace: default
+serviceAccountName: default
+
 services:
-  serviceType: ClusterIP
+  openflowServiceType: ClusterIP
+  ovsdbServiceType: ClusterIP
+  sshServiceType: ClusterIP
+  uiServiceType: ClusterIP
   ovsdb:
     port: 6640
   openflow:
@@ -41,6 +47,8 @@
   cluster:
     port: 9876
 
+onos_env: []
+
 resources: {}
 
 nodeSelector: {}
diff --git a/voltha/templates/envoy_for_etcd.yaml b/voltha/templates/envoy_for_etcd.yaml
index 7903605..38e9585 100644
--- a/voltha/templates/envoy_for_etcd.yaml
+++ b/voltha/templates/envoy_for_etcd.yaml
@@ -44,7 +44,7 @@
   name: voltha
   namespace: {{ .Values.global.namespace }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas.envoy_for_etcd }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/fluentd-config.yaml b/voltha/templates/fluentd-config.yaml
deleted file mode 100644
index 2329a6f..0000000
--- a/voltha/templates/fluentd-config.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-data:
-  fluentd.conf: |
-
-    #   Uncomment this source in environments where voltha services are forwarding logs to the fluentd port directly.
-    #    <source>
-    #      @type forward
-    #      port 24224
-    #    </source>
-
-    <source>
-      @id fluentd-containers.log
-      @type tail
-      path /var/log/containers/*.log
-      exclude_path ["/var/log/containers/*kube-system*.log"]
-      pos_file /var/log/containers/ag-containers.log.pos
-      time_format %Y-%m-%dT%H:%M:%S.%NZ
-      tag voltha.*
-      log_level debug
-      format json
-      read_from_head true
-    </source>
-    <match **>
-      @type forward
-      heartbeat_type tcp
-
-      # primary host
-      <server>
-        host fluentdactv
-        port 24224
-      </server>
-      # use secondary host
-      <server>
-        host fluentdstby
-        port 24224
-        standby
-      </server>
-      # use longer flush_interval to reduce CPU usage.
-      # note that this is a trade-off against latency.
-      flush_interval 60s
-    </match>
-
-  fluentd-agg.conf: |
-    <source>
-      @type forward
-      port 24224
-    </source>
-    <match **>
-      @type file
-
-      path /fluentd/log/voltha
-      buffer_path /fluentd/log/*.log
-      append true
-      time_slice_wait 10m
-      time_format %Y%m%dT%H%M%S%z
-      time_slice_format %Y%m%d%H
-    </match>
-kind: ConfigMap
-metadata:
-  name: fluentd-config
-  namespace: {{ .Values.global.namespace }}
diff --git a/voltha/templates/fluentd.yaml b/voltha/templates/fluentd.yaml
deleted file mode 100644
index 1e5b886..0000000
--- a/voltha/templates/fluentd.yaml
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# This file describes a cluster of 3 fluentd forwarders that
-# send logs to a cluster of 2 fluentd aggregators: one active
-# and one standby.
-#
-# The active fluentd aggregator
-#
-apiVersion: v1
-kind: Service
-metadata:
-  name: fluentdactv
-  namespace: {{ .Values.global.namespace }}
-  serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-spec:
-  clusterIP: None
-  selector:
-    app: fluentdactv
-  ports:
-  - protocol: TCP
-    port: 24224
-    targetPort: 24224
----
-#
-# Ensure that the active aggregator is not deployed to the
-# same node as the standby
-#
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: fluentdactv
-  namespace: {{ .Values.global.namespace }}
-  serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: fluentdactv
-      annotations:
-        cni: "weave"
-    spec:
-      serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-      terminationGracePeriodSeconds: 10
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
-                operator: In
-                values:
-                - fluentdstby
-            topologyKey: kubernetes.io/hostname
-      containers:
-      - name: fluentdactv
-        image: {{ .Values.k8s_docker_registry }}{{ .Values.images.fluentd.repository }}:{{ .Values.images.fluentd.tag }}
-        imagePullPolicy: {{ .Values.image_pull_policy }}
-        volumeMounts:
-        - name: fluentd-log
-          mountPath: /fluentd/log
-        - name: config-volume
-          mountPath: /etc/fluentd-config
-        ports:
-        - containerPort: 24224
-        env:
-        - name: FLUENTD_ARGS
-          value: -c /etc/fluentd-config/fluentd-agg.conf
-      volumes:
-      - name: config-volume
-        configMap:
-          name: fluentd-config
-      - name: fluentd-log
-        hostPath:
-          path: /var/log/voltha/logging_volume
-          type: Directory
----
-#
-# The standby fluentd aggregator
-#
-apiVersion: v1
-kind: Service
-metadata:
-  name: fluentdstby
-  namespace: {{ .Values.global.namespace }}
-spec:
-  clusterIP: None
-  selector:
-    app: fluentdstby
-  ports:
-  - protocol: TCP
-    port: 24224
-    targetPort: 24224
----
-#
-# Ensure thet the standby aggregator is not deployed to the
-# same node as the active
-#
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: fluentdstby
-  namespace: {{ .Values.global.namespace }}
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: fluentdstby
-      annotations:
-        cni: "weave"
-    spec:
-      serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-      terminationGracePeriodSeconds: 10
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
-                operator: In
-                values:
-                - fluentdactv
-            topologyKey: kubernetes.io/hostname
-      containers:
-      - name: fluentdstby
-        image: k8s.gcr.io/fluentd-gcp:1.30 
-        imagePullPolicy: Never
-        volumeMounts:
-        - name: fluentd-log
-          mountPath: /fluentd/log
-        - name: config-volume
-          mountPath: /etc/fluentd-config
-        ports:
-        - containerPort: 24224
-        env:
-        - name: FLUENTD_ARGS
-          value: -c /etc/fluentd-config/fluentd-agg.conf
-      volumes:
-      - name: config-volume
-        configMap:
-          name: fluentd-config
-      - name: fluentd-log
-        hostPath:
-          path: /var/log/voltha/logging_volume
-          type: Directory
----
-#
-# The cluster of fluentd forwarders.  The service itself will be removed once all fluentd forwarding logic are removed
-# from the specific voltha services.   Fluentd is defined as a DaemonSet which implies that only 1 instance will
-# run on each node.   Each instance will also gets its configuration data from a config map (fluentd-config.yml).
-#
-apiVersion: v1
-kind: Service
-metadata:
-  name: fluentd
-  namespace: {{ .Values.global.namespace }}
-spec:
-  clusterIP: None
-  selector:
-    app: fluentd
-  ports:
-  - protocol: TCP
-    port: 24224
-    targetPort: 24224
----
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: fluentd
-  namespace: {{ .Values.global.namespace }}
-spec:
-   template:
-    metadata:
-      labels:
-        app: fluentd
-      annotations:
-        cni: "weave"
-    spec:
-      serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-      tolerations:
-        - key: node-role.kubernetes.io/master
-          effect: NoSchedule
-      containers:
-      - name: fluentd
-        image: k8s.gcr.io/fluentd-gcp:1.30
-        env:
-        - name: FLUENTD_ARGS
-          value: -c /etc/fluentd-config/fluentd.conf
-        volumeMounts:
-        - name: varlog
-          mountPath: /var/log/
-        - name: varlogcontainers
-          mountPath: /var/lib/docker/containers/
-        - name: config-volume
-          mountPath: /etc/fluentd-config
-      volumes:
-      - name: varlog
-        hostPath:
-          path: /var/log/
-      - name: varlogcontainers
-        hostPath:
-          path: /var/lib/docker/containers/
-      - name: config-volume
-        configMap:
-          name: fluentd-config
diff --git a/voltha/templates/netconf.yaml b/voltha/templates/netconf.yaml
index d05afa8..cacbf2e 100644
--- a/voltha/templates/netconf.yaml
+++ b/voltha/templates/netconf.yaml
@@ -33,7 +33,7 @@
   namespace: {{ .Values.global.namespace }}
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
-  replicas: 3
+  replicas: {{ .Values.replicas.netconf }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/ofagent.yaml b/voltha/templates/ofagent.yaml
index 5f6d81e..124f0b4 100644
--- a/voltha/templates/ofagent.yaml
+++ b/voltha/templates/ofagent.yaml
@@ -19,7 +19,7 @@
   namespace: {{ .Values.global.namespace }}
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
-  replicas: 3
+  replicas: {{ .Values.replicas.ofagent }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/onos.yaml b/voltha/templates/onos.yaml
deleted file mode 100644
index 1549551..0000000
--- a/voltha/templates/onos.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
-   name: onos
-   namespace: {{ .Values.global.namespace }}
-   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-   labels:
-     name: onos
-spec:
-  ports:
-    - name: ssh
-      port: 8101
-      targetPort: 8101
-    - name: of
-      port: 6653
-      targetPort: 6653
-    - name: ui
-      port: 8181
-      targetPort: 8181
-  selector:
-    app: onos
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
-  name: onos
-  namespace: {{ .Values.global.namespace }}
-  serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: onos
-      annotations:
-        cni: "calico"
-    spec:
-      serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-      containers:
-        - name: onos
-          image: {{ .Values.pull_docker_registry }}{{ .Values.images.onos.repository }}:{{ .Values.images.onos.tag }}
-          env:
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: ONOS_APPS
-              value: "drivers,openflow-base"
-          ports:
-            - containerPort: 8101
-              name: ssh-port
-            - containerPort: 6653
-              name: of-port
-            - containerPort: 8181
-              name: ui-port
-          imagePullPolicy: {{ .Values.image_pull_policy }}
diff --git a/voltha/templates/vcli.yaml b/voltha/templates/vcli.yaml
index 76c8681..5b8fbdb 100644
--- a/voltha/templates/vcli.yaml
+++ b/voltha/templates/vcli.yaml
@@ -37,7 +37,7 @@
   namespace: {{ .Values.global.namespace }}
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
-  replicas: 2
+  replicas: {{ .Values.replicas.vcli }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/vcore_for_etcd.yaml b/voltha/templates/vcore_for_etcd.yaml
index 8ceb6f3..b9051ee 100644
--- a/voltha/templates/vcore_for_etcd.yaml
+++ b/voltha/templates/vcore_for_etcd.yaml
@@ -42,7 +42,7 @@
   namespace: {{ .Values.global.namespace }}
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
-  replicas: 3
+  replicas: {{ .Values.replicas.vcore }}
   template:
     metadata:
       labels:
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 0f0ef27..13b23c5 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -17,6 +17,13 @@
 
 image_pull_policy: IfNotPresent
 
+replicas:
+  vcore: 1
+  vcli: 1
+  ofagent: 1
+  netconf: 1
+  envoy_for_etcd: 1
+
 
 node_ports:
   vcli_port: 30110
@@ -120,7 +127,7 @@
 - "/ofagent/ofagent/main.py"
 - "-v"
 - "--consul=consul.$(NAMESPACE).svc.cluster.local:8500"
-- "--controller=onos:6653"
+- "--controller=onos-voltha-openflow:6653"
 - "--grpc-endpoint=vcore.$(NAMESPACE).svc.cluster.local:50556"
 - "--enable-tls"
 - "--key-file=/ofagent/pki/voltha.key"
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 5f2b6e6..403884d 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -83,7 +83,7 @@
           maxBytes: 10485760
           backupCount: 5
       loggers:
-        '':
+        'multistructlog':
           handlers:
               - console
               - file
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index ff949b5..6219740 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -18,9 +18,6 @@
 - name: onos-service
   version: 0.1.0
   repository: file://../../xos-services/onos-service
-- name: addressmanager
-  version: 0.1.0
-  repository: file://../../xos-services/addressmanager
 - name: fabric
   version: 0.1.0
   repository: file://../../xos-services/fabric
@@ -30,3 +27,6 @@
 - name: vsg-hw
   version: 0.1.0
   repository: file://../../xos-services/vsg-hw
+- name: vrouter
+  version: 0.1.0
+  repository: file://../../xos-services/vrouter
diff --git a/xos-profiles/rcord-lite/values.yaml b/xos-profiles/rcord-lite/values.yaml
index 3a4974f..cf65680 100644
--- a/xos-profiles/rcord-lite/values.yaml
+++ b/xos-profiles/rcord-lite/values.yaml
@@ -39,11 +39,6 @@
 xosAdminPassword: letmein
 
 # Service-specific configuration.
-addressmanager:
-  serviceConfig:
-    accessor:
-      username: admin@opencord.org
-      password: letmein
 fabric:
   serviceConfig:
     accessor:
@@ -192,7 +187,8 @@
               name: ONOS_Fabric
               kind: platform
               no_container: true
-              rest_hostname: onos-fabric
+              rest_hostname: onos-fabric-ui
+              rest_port: 8181
         serviceattribute#fabric_network_cfg_json:
           type: tosca.nodes.ServiceAttribute
           requirements:
@@ -230,8 +226,6 @@
     tosca_definitions_version: tosca_simple_yaml_1_0
     description: Set up VOLT, AddressManager, and RCORD services
     imports:
-      - custom_types/addressmanagerservice.yaml
-      - custom_types/addresspool.yaml
       - custom_types/image.yaml
       - custom_types/network.yaml
       - custom_types/networkslice.yaml
@@ -246,9 +240,15 @@
       - custom_types/serviceinstancelink.yaml
       - custom_types/slice.yaml
       - custom_types/voltservice.yaml
+      - custom_types/vrouterservice.yaml
       - custom_types/vsghwservice.yaml
     topology_template:
       node_templates:
+        service#ONOS_Fabric:
+          type: tosca.nodes.ONOSService
+          properties:
+              name: ONOS_Fabric
+              must-exist: true
         service#rcord:
           type: tosca.nodes.Service
           properties:
@@ -273,10 +273,15 @@
           type: tosca.nodes.VSGHWService
           properties:
             name: vsg-hw
-        service#addressmanager:
-          type: tosca.nodes.AddressManagerService
+        service#vrouter:
+          type: tosca.nodes.VRouterService
           properties:
-            name: addressmanager
+            name: vrouter
+            kind: rcord
+            rest_hostname: onos-fabric-ui
+            rest_port: 8181
+            rest_user: karaf
+            rest_pass: karaf
         volt_vsg-hw:
           type: tosca.nodes.ServiceDependency
           properties:
@@ -288,7 +293,7 @@
             - provider_service:
                 node: service#vsg-hw
                 relationship: tosca.relationships.BelongsToOne
-        vsg-hw_addressmanager:
+        onos_fabric_vsg-hw:
           type: tosca.nodes.ServiceDependency
           properties:
             connect_method: None
@@ -297,7 +302,18 @@
                 node: service#vsg-hw
                 relationship: tosca.relationships.BelongsToOne
             - provider_service:
-                node: service#addressmanager
+                node: service#ONOS_Fabric
+                relationship: tosca.relationships.BelongsToOne
+        vsg-hw_vrouter:
+          type: tosca.nodes.ServiceDependency
+          properties:
+            connect_method: None
+          requirements:
+            - subscriber_service:
+                node: service#vsg-hw
+                relationship: tosca.relationships.BelongsToOne
+            - provider_service:
+                node: service#vrouter
                 relationship: tosca.relationships.BelongsToOne
 
   serviceGraphConstraints:
@@ -310,4 +326,4 @@
         constraints:
           type: tosca.nodes.ServiceGraphConstraint
           properties:
-            constraints: '[[null, "rcord"], [null, "volt"], ["addressmanager", "vsg-hw"]]'
+            constraints: '[[null, "rcord"], [null, "volt"], ["ONOS_Fabric", "vsg-hw"], [null, "vrouter"]]'
diff --git a/xos-services/fabric/values.yaml b/xos-services/fabric/values.yaml
index 78e8303..ec2e3d6 100644
--- a/xos-services/fabric/values.yaml
+++ b/xos-services/fabric/values.yaml
@@ -53,4 +53,20 @@
   steps_dir: "/opt/xos/synchronizers/fabric/steps"
   sys_dir: "/opt/xos/synchronizers/fabric/sys"
   models_dir: "/opt/xos/synchronizers/fabric/models"
+  logging:
+    version: 1
+    handlers:
+      console:
+        class: logging.StreamHandler
+      file:
+        class: logging.handlers.RotatingFileHandler
+        filename: /var/log/xos.log
+        maxBytes: 10485760
+        backupCount: 5
+    loggers:
+      'multistructlog':
+        handlers:
+            - console
+            - file
+        level: DEBUG
 
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 28fc6d4..9a81457 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -48,3 +48,19 @@
   steps_dir: "/opt/xos/synchronizers/onos/steps"
   sys_dir: "/opt/xos/synchronizers/onos/sys"
   models_dir: "/opt/xos/synchronizers/onos/models"
+  logging:
+    version: 1
+    handlers:
+      console:
+        class: logging.StreamHandler
+      file:
+        class: logging.handlers.RotatingFileHandler
+        filename: /var/log/xos.log
+        maxBytes: 10485760
+        backupCount: 5
+    loggers:
+      'multistructlog':
+        handlers:
+            - console
+            - file
+        level: DEBUG
diff --git a/xos-services/openstack/.helmignore b/xos-services/openstack/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/xos-services/openstack/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/xos-services/openstack/Chart.yaml b/xos-services/openstack/Chart.yaml
new file mode 100644
index 0000000..0e8058c
--- /dev/null
+++ b/xos-services/openstack/Chart.yaml
@@ -0,0 +1,21 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for XOS's "openstack" service
+name: openstack
+version: 0.1.0
diff --git a/xos-services/openstack/templates/_helpers.tpl b/xos-services/openstack/templates/_helpers.tpl
new file mode 100644
index 0000000..b61f963
--- /dev/null
+++ b/xos-services/openstack/templates/_helpers.tpl
@@ -0,0 +1,47 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-present Open Networking Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "openstack.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "openstack.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "openstack.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/xos-services/openstack/templates/configmap.yaml b/xos-services/openstack/templates/configmap.yaml
new file mode 100644
index 0000000..6d234c4
--- /dev/null
+++ b/xos-services/openstack/templates/configmap.yaml
@@ -0,0 +1,23 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: openstack
+data:
+  serviceConfig: |
+{{ toYaml .Values.serviceConfig | indent 4 }}
diff --git a/xos-services/openstack/templates/deployment.yaml b/xos-services/openstack/templates/deployment.yaml
new file mode 100644
index 0000000..f202d79
--- /dev/null
+++ b/xos-services/openstack/templates/deployment.yaml
@@ -0,0 +1,73 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "openstack.fullname" . }}
+  labels:
+    app: {{ template "openstack.name" . }}
+    chart: {{ template "openstack.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "openstack.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "openstack.name" . }}
+        release: {{ .Release.Name }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.pull_docker_registry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+          volumeMounts:
+            - name: openstack-config
+              mountPath: /opt/xos/synchronizers/openstack/openstack_config.yaml
+              subPath: openstack_config.yaml
+            - name: cert-chain-secret
+              mountPath: /usr/local/share/ca-certificates
+      volumes:
+        - name: openstack-config
+          configMap:
+            name: openstack
+            items:
+              - key: serviceConfig
+                path: openstack_config.yaml
+        - name: cert-chain-secret
+          secret:
+            secretName: cert-chain-secret
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/xos-services/openstack/values.yaml b/xos-services/openstack/values.yaml
new file mode 100644
index 0000000..1a0e355
--- /dev/null
+++ b/xos-services/openstack/values.yaml
@@ -0,0 +1,66 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Default values for addressmanager.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+pull_docker_registry:
+
+nameOverride: ""
+fullnameOverride: ""
+
+image:
+  repository: xosproject/openstack-synchronizer
+  tag: master
+  pullPolicy: IfNotPresent
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+serviceConfig:
+  name: openstack-synchronizer
+  accessor:
+    username: admin@opencord.org
+    password: letmein
+    endpoint: xos-core:50051
+  dependency_graph: "/opt/xos/synchronizers/openstack/model-deps"
+  steps_dir: "/opt/xos/synchronizers/openstack/steps"
+  sys_dir: "/opt/xos/synchronizers/openstack/sys"
+  model_policies_dir: "/opt/xos/synchronizers/openstack/model_policies"
+  images_directory: "/opt/xos/images"
+  required_models:
+    - ControllerImages
+    - ControllerNetwork
+    - ControllerSitePrivilege
+    - ControllerSite
+    - ControllerSlicePrivilege
+    - ControllerSlice
+    - ControllerUser
+    - Image
+    - Instance
+    - Port
+    - Role
+  nova:
+    ca_ssl_cert: "/etc/ssl/certs/ca-certificates.crt"
+    enabled: True
diff --git a/xos-services/volt/values.yaml b/xos-services/volt/values.yaml
index aa537a3..a25cc99 100644
--- a/xos-services/volt/values.yaml
+++ b/xos-services/volt/values.yaml
@@ -53,7 +53,7 @@
   model_policies_dir: "/opt/xos/synchronizers/volt/model_policies"
   models_dir: "/opt/xos/synchronizers/volt/models"
   steps_dir: "/opt/xos/synchronizers/volt/steps"
-  # pull_steps_dir: "/opt/xos/synchronizers/volt/pull_steps"
+  pull_steps_dir: "/opt/xos/synchronizers/volt/pull_steps"
   logging:
     version: 1
     handlers:
diff --git a/xos-services/vrouter/.helmignore b/xos-services/vrouter/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/xos-services/vrouter/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/xos-services/vrouter/Chart.yaml b/xos-services/vrouter/Chart.yaml
new file mode 100644
index 0000000..29f15d0
--- /dev/null
+++ b/xos-services/vrouter/Chart.yaml
@@ -0,0 +1,21 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for XOS's "vRouter" service
+name: vrouter
+version: 0.1.0
diff --git a/xos-services/vrouter/templates/_helpers.tpl b/xos-services/vrouter/templates/_helpers.tpl
new file mode 100644
index 0000000..03d5458
--- /dev/null
+++ b/xos-services/vrouter/templates/_helpers.tpl
@@ -0,0 +1,47 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-present Open Networking Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "vrouter.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "vrouter.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "vrouter.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/xos-services/vrouter/templates/configmap.yaml b/xos-services/vrouter/templates/configmap.yaml
new file mode 100644
index 0000000..dd8e766
--- /dev/null
+++ b/xos-services/vrouter/templates/configmap.yaml
@@ -0,0 +1,23 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vrouter
+data:
+  serviceConfig: |
+{{ toYaml .Values.serviceConfig | indent 4 }}
diff --git a/xos-services/vrouter/templates/deployment.yaml b/xos-services/vrouter/templates/deployment.yaml
new file mode 100644
index 0000000..82630a3
--- /dev/null
+++ b/xos-services/vrouter/templates/deployment.yaml
@@ -0,0 +1,73 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "vrouter.fullname" . }}
+  labels:
+    app: {{ template "vrouter.name" . }}
+    chart: {{ template "vrouter.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "vrouter.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "vrouter.name" . }}
+        release: {{ .Release.Name }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.pull_docker_registry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+          volumeMounts:
+            - name: vrouter-config
+              mountPath: /opt/xos/synchronizers/vrouter/vrouter_config.yaml
+              subPath: vrouter_config.yaml
+            - name: cert-chain-secret
+              mountPath: /usr/local/share/ca-certificates
+      volumes:
+        - name: vrouter-config
+          configMap:
+            name: vrouter
+            items:
+              - key: serviceConfig
+                path: vrouter_config.yaml
+        - name: cert-chain-secret
+          secret:
+            secretName: cert-chain-secret
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/xos-services/vrouter/values.yaml b/xos-services/vrouter/values.yaml
new file mode 100644
index 0000000..c267596
--- /dev/null
+++ b/xos-services/vrouter/values.yaml
@@ -0,0 +1,71 @@
+---
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Default values for addressmanager.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+pull_docker_registry:
+
+nameOverride: ""
+fullnameOverride: ""
+
+image:
+  repository: xosproject/vrouter-synchronizer
+  tag: master
+  pullPolicy: IfNotPresent
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+serviceConfig:
+  name: vrouter
+  accessor:
+    username: admin@opencord.org
+    password: letmein
+    endpoint: xos-core:50051
+  required_models:
+    - VRouterService
+    - VRouterDevice
+    - VRouterApp
+    - VRouterPort
+  dependency_graph: "/opt/xos/synchronizers/vrouter/model-deps"
+  steps_dir: "/opt/xos/synchronizers/vrouter/steps"
+  sys_dir: "/opt/xos/synchronizers/vrouter/sys"
+  models_dir: "/opt/xos/synchronizers/vrouter/models"
+  logging:
+    version: 1
+    handlers:
+      console:
+        class: logging.StreamHandler
+      file:
+        class: logging.handlers.RotatingFileHandler
+        filename: /var/log/xos.log
+        maxBytes: 10485760
+        backupCount: 5
+    loggers:
+      'multistructlog':
+        handlers:
+            - console
+            - file
+        level: DEBUG
diff --git a/xos-services/vsg-hw/values.yaml b/xos-services/vsg-hw/values.yaml
index 12b3f69..7f23fe3 100644
--- a/xos-services/vsg-hw/values.yaml
+++ b/xos-services/vsg-hw/values.yaml
@@ -53,3 +53,19 @@
   model_policies_dir: "/opt/xos/synchronizers/vsg-hw/model_policies"
   sys_dir: "/opt/xos/synchronizers/vsg-hw/sys"
   models_dir: "/opt/xos/synchronizers/vsg-hw/models"
+  logging:
+    version: 1
+    handlers:
+      console:
+        class: logging.StreamHandler
+      file:
+        class: logging.handlers.RotatingFileHandler
+        filename: /var/log/xos.log
+        maxBytes: 10485760
+        backupCount: 5
+    loggers:
+      'multistructlog':
+        handlers:
+            - console
+            - file
+        level: DEBUG