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

diff --combined kubernetes/onap/values.yaml
index af8456a,5ac7978..5344a42
--- 1/kubernetes/onap/values.yaml
--- 2/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 4a4a8ba,a3050ef..e540aa0
--- 1/kubernetes/oof/values.yaml
--- 2/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"