From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Wed, 11 Dec 2019 14:25:20 +0000 (+0000)
Subject: Merge "[Common] Use global storage templates for PVC"
X-Git-Tag: 6.0.0~483
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5145c61e87e1d73935d395abfba6b9becb5d3b87;hp=-c;p=oom.git

Merge "[Common] Use global storage templates for PVC"
---

5145c61e87e1d73935d395abfba6b9becb5d3b87
diff --combined kubernetes/onap/values.yaml
index af8456a9eb,5ac7978229..5344a423f3
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -57,12 -57,6 +57,12 @@@ global
    # flag to enable debugging - application support required
    debugEnabled: false
  
 +  #Global ingress configuration
 +  ingress:
 +    enabled: false
 +    virtualhost:
 +        enabled: true
 +        baseurl: "simpledemo.onap.org"
  #################################################################
  # Enable/disable and configure helm charts (ie. applications)
  # to customize the ONAP deployment.
@@@ -119,8 -113,6 +119,6 @@@ nbi
      # openstack configuration
      openStackRegion: "Yolo"
      openStackVNFTenantId: "1234"
- nfs-provisioner:
-   enabled: false
  policy:
    enabled: false
  pomba:
@@@ -175,4 -167,4 +173,4 @@@ vid
  vnfsdk:
    enabled: false
  modeling:
 -  enabled: false
 +  enabled: false
diff --combined kubernetes/oof/values.yaml
index 4a4a8baa47,a3050ef593..e540aa096a
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@@ -21,6 -21,7 +21,7 @@@ global
    readinessImage: readiness-check:2.0.0
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
+   persistence: {}
  #################################################################
  # Application configuration defaults.
  #################################################################
@@@ -151,9 -152,3 +152,9 @@@ service
    nodePort: 48
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "oofosdf"
 +      name: "oof-osdf"
 +      port: 8698
 +  config:
 +    ssl: "none"