Merge "[COMMON][ELASTIC] Uses new tpls for repos / images"

diff --combined kubernetes/sdnc/values.yaml
index 7f6312f,41c748c..af5a6f4
--- 1/kubernetes/sdnc/values.yaml
--- 2/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -136,7 -136,7 +136,7 @@@ secrets
  
  repository: nexus3.onap.org:10001
  pullPolicy: Always
 -image: onap/sdnc-image:2.0.3
 +image: onap/sdnc-image:2.0.4
  busyboxRepository: docker.io
  busyboxImage: busybox:1.30
  
@@@ -348,14 -348,14 +348,14 @@@ dgbuilder
  # local elasticsearch cluster
  localElasticCluster: true
  elasticsearch:
-   nameOverride: sdnrdb
+   nameOverride: &elasticSearchName sdnrdb
    name: sdnrdb-cluster
    certInitializer:
      fqdn: "sdnc"
      fqi_namespace: org.onap.sdnc
      fqi: "sdnc@sdnc.onap.org"
    service:
-     name: sdnrdb
+     name: *elasticSearchName
    master:
      replicaCount: 3
      # dedicatednode: "yes"
@@@ -363,7 -363,8 +363,8 @@@
      # dedicatednode: "no"
      # handles master and data node functionality
      dedicatednode: "no"
-     nameOverride: sdnrdb
+     nameOverride: *elasticSearchName
+     cluster_name: *elasticSearchName
  # enable
  sdnc-web:
    enabled: true