Fail to import service with node filter using 'in_range'

[sdc.git] / docs / configuration.rst

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 4b7bea0..480aead 100644 (file)
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -12,6 +12,9 @@ Configuration
 Global Configuration
 ====================
 
+SDC configuration is applied by several init containers running Chef recipes
+The files below describe the environment files that are applied on startup
+
 environment.json
 ----------------
 
@@ -35,8 +38,6 @@ environment.json
             "FE_VIP": "yyy",
             "ES_VIP": "yyy",
             "KB_VIP": "yyy",
-            "DCAE_BE_VIP": "yyy",
-            "DCAE_FE_VIP": "yyy",
             "interfaces": {
                 "application": "eth0",
                 "private": "eth1"
@@ -58,6 +59,17 @@ environment.json
                 "fqdn": ["10.0.11.1", "10.0.11.1"]
             },
 
+            # Kafka config
+            "Kafka": {
+             "bootstrap": "kafka-bootstrap:9092"
+            },
+
+            # Messaging topics to be used by clients
+            "DistributionTopics": {
+             "notificationTopicName": "SDC-DISTR-NOTIF-TOPIC",
+             "statusTopicName": "SDC-DISTR-STATUS-TOPIC"
+            },
+
             # IPs used for docker configuration
             "Nodes": {
                 "CS": ["yyy"],
@@ -80,6 +92,14 @@ environment.json
             "VnfRepo": {
                 "vnfRepoPort": "8702",
                 "vnfRepoHost": "10.0.14.1"
+            }, 
+            "HelmValidator": {
+                "validator_enabled": true,
+                "helm_version": "3.5.2",
+                "deployable": true,
+                "lintable": false,
+                "strict_lintable": false,
+                "validator_url": "http://sdc-helm-validator:8080/validate"
             }
         },
         "override_attributes": {
@@ -397,8 +417,8 @@ BE-configuration.yaml
         summaryOfImpactsToECOMPElements:
             displayName: Summary of impacts to ECOMP elements,OSSs, BSSs
             type: OTHER
-        controlLoopFunctions:
-            displayName: Control Loop Functions
+        automationCompositionFunctions:
+            displayName: Automation Composition Functions
             type: OTHER
         dimensioningInfo:
             displayName: Dimensioning Info
@@ -801,17 +821,6 @@ BE-configuration.yaml
         # Url for onboarding health check
         healthCheckUri: "/onboarding-api/v1.0/healthcheck"
 
-    dcae:
-        # The ip of the onboarding docker
-        host: <%= @dcae_be_vip %>
-        # The protocol to use
-        protocol: <https/http>
-        # The port the docker is listening on
-        port: <port>
-        # The url of the health check to use
-        healthCheckUri: "/dcae/healthCheck"
-
-
     #GSS IDNS
     # Switchover configuration is used for Geo redundancy to provide automatic failovers
     switchoverDetector:
@@ -967,6 +976,9 @@ BE-configuration.yaml
     definedResourceNamespace:
        - org.openecomp.resource.
 
+    # Comma separated list of excluded URLs by the DataValidatorFilter
+    dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize"
+
 BE-distribution-engine-configuration.yaml
 *****************************************
 
@@ -1279,9 +1291,6 @@ FE-configuration.yaml
         -
             - &HTTP_IV_USER HTTP_IV_USER
             - &iv-user iv-user
-        -
-            - &USER_ID USER_ID
-            - &user-id user-id
         -
             - &HTTP_CSP_ATTUID HTTP_CSP_ATTUID
             - &csp-attuid csp-attuid
@@ -1303,6 +1312,9 @@ FE-configuration.yaml
         -
             - &HTTP_CSP_EMAIL HTTP_CSP_EMAIL
             - &csp-email csp-email
+        -
+            - &USER_ID USER_ID
+            - &user-id user-id
 
     # Frontend configuration version
     version: 1.0
@@ -1332,6 +1344,9 @@ FE-configuration.yaml
         # What is the interval of the statistics collection
         probeIntervalInSeconds: 15
 
+    # Comma separated list of excluded URLs by the DataValidatorFilter
+    dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize"
+
 
 FE-plugins-configuration.yaml
 *****************************