Merge "[DCAE] Disable CBS deployment and remove CBS dependency"

diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index f92bfa7..9306985 100644 (file)
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -87,7 +87,7 @@ uui:
 vfc:
   enabled: true
 vid:
-  enabled: true
+  enabled: false
 vnfsdk:
   enabled: true
 modeling:

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 73f96d3..f5b5c8e 100755 (executable)
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -135,7 +135,7 @@ global:
 
   # default password complexity
   # available options: phrase, name, pin, basic, short, medium, long, maximum security
-  # More datails: https://masterpassword.app/masterpassword-algorithm.pdf
+  # More datails: https://www.masterpasswordapp.com/masterpassword-algorithm.pdf
   passwordStrength: long
 
   # configuration to set log level to all components (the one that are using

diff --git a/kubernetes/oof/components/oof-has/values.yaml b/kubernetes/oof/components/oof-has/values.yaml
index 248d3af..bc129be 100755 (executable)
--- a/kubernetes/oof/components/oof-has/values.yaml
+++ b/kubernetes/oof/components/oof-has/values.yaml
@@ -155,3 +155,6 @@ etcd-init:
     keyPrefix: conductor
   flavor: *etcd-flavor
   resources: *etcd-resources
+
+# Python doesn't support well dollar sign in password
+passwordStrengthOverride: basic
\ No newline at end of file