COMAC-255 Improve ONOS chart for better support of various ONOS apps

- Add release name to configmap to allow multiple deployments
- Add ability to support additional Services

Change-Id: I16f45dbd6129aa1cc3e1fbf41bfd8de27b565bd2
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index f463c1d..499a821 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -50,19 +50,6 @@
           command: ["./bin/onos-service", "server", "debug"]
           env:
 {{ toYaml .Values.onos_env | indent 12 }}
-          ports:
-            - name: ovsdb
-              containerPort: {{ .Values.services.ovsdb.port }}
-            - name: openflow
-              containerPort: {{ .Values.services.openflow.port }}
-            - name: ssh
-              containerPort: {{ .Values.services.ssh.port }}
-            - name: ui
-              containerPort: {{ .Values.services.ui.port }}
-            - name: cluster
-              containerPort: {{ .Values.services.cluster.port }}
-            - name: debugger
-              containerPort: {{ .Values.services.debugger.port }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
@@ -102,7 +89,7 @@
             optional: true
         - name: onos-logs-cfg
           configMap:
-            name: onos
+            name: {{ template "onos.fullname" . }}-onos
             items:
               - key: logCfg
                 path: org.ops4j.pax.logging.cfg
@@ -111,7 +98,7 @@
 {{- if .Values.log_agent.enabled }}
         - name: log-agent-configmap-volume
           configMap:
-            name: log-agent-configmap
+            name: {{ template "onos.fullname" . }}-log-agent-configmap
             items:
               - key: config
                 path: filebeat.yml