4 files changed, 22 insertions, 28 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 70c4721fb1..314622f4c6 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -92,10 +92,6 @@ dependencies:
     version: ~5.x-0
     repository: '@local'
     condition: nbi.enabled
-  - name: nfs-provisioner
-    version: ~5.x-0
-    repository: '@local'
-    condition: nfs-provisioner.enabled
   - name: pnda
     version: ~5.x-0
     repository: '@local'
diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index 989174c1c4..336e93788c 100644
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -13,10 +13,10 @@
 # limitations under the License.
 
 
-# This override file is used to deploy a minmal configuration to
-# to onboard and deploy a VNF.
+# This override file is used to deploy a minimal configuration to
+# onboard and deploy a VNF.
 # It includes the following components:
-# A&AI, DMAAP, Portal, Robot, SDC, SDNC, SO, VID
+# A&AI, Cassandra, DMAAP, Portal, Robot, SDC, SDNC, SO, VID
 #
 # Minimal resources are also reviewed for the various containers
 # A&AI: no override => to be fixed
@@ -52,7 +52,7 @@ aaf:
 appc:
   enabled: false
 cassandra:
-  enabled: false
+  enabled: true
   replicaCount: 1
 clamp:
   enabled: false
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index 7ef1e02714..291a0321f7 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -68,16 +68,14 @@ sdnc:
   enabled: true
 so:
   enabled: true
+  ingress:
+    enabled: true
   so-monitoring:
+    ingress:
+      enabled: true
+  so-vnfm-adapter:
+    ingress:
       enabled: true
-      ingress:
-          enabled: true
-          service:
-              - path: "/so-monitoring"
-                name: "so-monitoring"
-                port: 9091
-          annotations:
-            nginx.ingress.kubernetes.io/ssl-redirect: "false"
 uui:
   enabled: true
 vfc:
@@ -85,15 +83,11 @@ vfc:
 vid:
   enabled: true
   ingress:
-   enabled: true
-   service:
-       - path: "/vid"
-         name: "vid-http"
-         port: 8080
-   annotations:
-         nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    enabled: true
 vnfsdk:
   enabled: true
-nginx-ingress:
-    enabled: true
 
+#ingress virtualhost based configuration
+global:
+  ingress:
+    enabled: true
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 672ae2ef9e..5344a423f3 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -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.
@@ -113,8 +119,6 @@ nbi:
     # openstack configuration
     openStackRegion: "Yolo"
     openStackVNFTenantId: "1234"
-nfs-provisioner:
-  enabled: false
 policy:
   enabled: false
 pomba:
@@ -169,4 +173,4 @@ vid:
 vnfsdk:
   enabled: false
 modeling:
-  enabled: false
+  enabled: false
+\ No newline at end of file