Moving the openolt-adapter grp_timeout parameter to be part of global

Change-Id: Ic90bacb46300c4a261d3fadc6de1c5dfbdaca065
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index d008565..bb767c7 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-openolt"
-version: "2.11.0"
+version: "2.11.1"
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 8c88b4c..0bd2e31 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -25,12 +25,12 @@
   image_org: "voltha/"
   image_pullPolicy: "Always"
   core_endpoint: "{{ .Values.global.voltha_release_name }}-{{ .Values.global.stack_name }}-core.{{ .Release.Namespace }}.svc:55558"
+  # timeout for RPC request
+  rpc_timeout: "10s"
   adapter_open_olt:
     timeout: "5s"
     heartbeat_check_interval: "15s"
     heartbeat_fail_interval: "31s"
-    # timeout for RPC request
-    rpc_timeout: "10s"
 
   #enable OMCC encryption
   omcc_encryption: false
@@ -98,7 +98,7 @@
   kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
   heartbeat_check_interval: '{{ .Values.global.adapter_open_olt.heartbeat_check_interval }}'
   heartbeat_fail_interval: '{{ .Values.global.adapter_open_olt.heartbeat_fail_interval }}'
-  rpc_timeout: '{{ .Values.global.adapter_open_olt.rpc_timeout }}'
+  rpc_timeout: '{{ .Values.global.rpc_timeout }}'
   endpoints:
     # core_endpoint: '{{ .Values.global.adapter_open_olt.core_endpoint }}'
     # adapter_endpoint: '{{ template "fullname" . }}-api:55560'