Merge "[OAM-271] sdnc-web is not comming up"

diff --combined smo-install/helm-override/cnf/onap-override.yaml
index ab1af5e,bef77af..3b8085e
--- 1/smo-install/helm-override/cnf/onap-override.yaml
--- 2/smo-install/helm-override/cnf/onap-override.yaml
+++ b/smo-install/helm-override/cnf/onap-override.yaml
@@@ -172,26 -172,26 +172,26 @@@ contrib
    netbox:
      enabled: true
  consul:
 -  enabled: true
 +  enabled: false
    consul-server:
      replicaCount: 1
  cps: 
    enabled: false
  
  dcaegen2: 
 -  enabled: true
 +  enabled: false
    dcae-bootstrap:
      enabled: false
    dcae-cloudify-manager:
 -    enabled: true
 +    enabled: false
    dcae-config-binding-service:
 -    enabled: true
 +    enabled: false
    dcae-dashboard:
      enabled: false
    dcae-deployment-handler:
      enabled: false
    dcae-healthcheck:
 -    enabled: true
 +    enabled: false
    dcae-inventory-api:
      enabled: false
    dcae-policy-handler:
@@@ -246,7 -246,26 +246,7 @@@ holmes
    enabled: false 
  dmaap: 
    enabled: true 
 -  message-router:
 -    message-router-zookeeper:
 -      replicaCount: 1
 -      zookeeperServers: 1
 -    message-router-kafka:
 -      zookeeper:
 -        replicaCount: 1
 -      replicaCount: 1
 -      defaultpartitions: 1
 -      configurationOverrides:
 -        "offsets.topic.replication.factor": "1"
 -        "log.dirs": "/var/lib/kafka/data"
 -        "log.retention.hours": "168"
 -        "num.partitions": "1"
 -        "transaction.state.log.replication.factor": "1"
 -        "transaction.state.log.min.isr": "1"
 -        "num.recovery.threads.per.data.dir": "5"
 -        "zookeeper.connection.timeout.ms": "6000"
 -        "default.replication.factor": "1"
 -        "zookeeper.set.acl": "true"
 +
  esr:
    enabled: false
  log:
@@@ -269,7 -288,7 +269,7 @@@ nbi
  oof:
    enabled: false
  platform:
 -  enabled: true
 +  enabled: false
  policy:
    enabled: true
    policy-api:
@@@ -291,7 -310,7 +291,7 @@@
    policy-clamp-ac-k8s-ppnt:
      enabled: true
    policy-gui:
 -    enabled: true
 +    enabled: false
    policy-nexus:
      enabled: false
    policy-clamp-ac-pf-ppnt:
@@@ -341,11 -360,6 +341,6 @@@ sdnc
      enabled: true
    cds:
      enabled: false
-   sdnc-web:
-     config:
-       topologyserver:
-         enabled: true
-         topologyserverUrl: http://topology.nonrtric:3001
    config:
      sdnr:
        enabled: true
@@@ -371,10 -385,6 +366,10 @@@
          eventLogMsgDetail: LONG
  sniro-emulator:
    enabled: false
 +
 +strimzi:
 +  enabled: true
 +
  so:
    enabled: true
    so-catalog-db-adapter:

diff --combined smo-install/helm-override/default/onap-override.yaml
index de6dab3,39d8b16..b1eeba2
--- 1/smo-install/helm-override/default/onap-override.yaml
--- 2/smo-install/helm-override/default/onap-override.yaml
+++ b/smo-install/helm-override/default/onap-override.yaml
@@@ -172,25 -172,25 +172,25 @@@ contrib
    netbox:
      enabled: false
  consul: 
 -  enabled: true
 +  enabled: false
    consul-server:
      replicaCount: 1
  cps: 
    enabled: false
  dcaegen2: 
 -  enabled: true
 +  enabled: false
    dcae-bootstrap:
      enabled: false
    dcae-cloudify-manager:
 -    enabled: true
 +    enabled: false
    dcae-config-binding-service:
 -    enabled: true
 +    enabled: false
    dcae-dashboard:
      enabled: false
    dcae-deployment-handler:
      enabled: false
    dcae-healthcheck:
 -    enabled: true
 +    enabled: false
    dcae-inventory-api:
      enabled: false
    dcae-policy-handler:
@@@ -248,6 -248,26 +248,6 @@@ holmes
    enabled: false 
  dmaap: 
    enabled: true 
 -  message-router:
 -    message-router-zookeeper:
 -      replicaCount: 1
 -      zookeeperServers: 1
 -    message-router-kafka:
 -      zookeeper:
 -        replicaCount: 1
 -      replicaCount: 1
 -      defaultpartitions: 1
 -      configurationOverrides:
 -        "offsets.topic.replication.factor": "1"
 -        "log.dirs": "/var/lib/kafka/data"
 -        "log.retention.hours": "168"
 -        "num.partitions": "1"
 -        "transaction.state.log.replication.factor": "1"
 -        "transaction.state.log.min.isr": "1"
 -        "num.recovery.threads.per.data.dir": "5"
 -        "zookeeper.connection.timeout.ms": "6000"
 -        "default.replication.factor": "1"
 -        "zookeeper.set.acl": "true"
  
  esr: 
    enabled: false 
@@@ -269,7 -289,7 +269,7 @@@ nbi
  oof:
    enabled: false
  platform:
 -  enabled: true
 +  enabled: false
  policy: 
    enabled: true
    policy-api:
@@@ -291,7 -311,7 +291,7 @@@
    policy-clamp-ac-k8s-ppnt:
      enabled: true
    policy-gui:
 -    enabled: true
 +    enabled: false
      image: onap/policy-gui:2.2.1
    policy-nexus:
      enabled: false
@@@ -343,11 -363,6 +343,6 @@@ sdnc
      enabled: true
    cds:
      enabled: false
-   sdnc-web:
-     config:
-       topologyserver:
-         enabled: true
-         topologyserverUrl: http://topology.nonrtric:3001
    config:
      sdnr:
        enabled: true
@@@ -373,10 -388,6 +368,10 @@@
          eventLogMsgDetail: LONG
  sniro-emulator:
    enabled: false
 +
 +strimzi:
 +  enabled: true
 +
  so: 
    enabled: false
    so-catalog-db-adapter:

diff --combined smo-install/helm-override/pythonsdk-tests/onap-override.yaml
index e19d332,4cade2d..d66ea9f
--- 1/smo-install/helm-override/pythonsdk-tests/onap-override.yaml
--- 2/smo-install/helm-override/pythonsdk-tests/onap-override.yaml
+++ b/smo-install/helm-override/pythonsdk-tests/onap-override.yaml
@@@ -172,25 -172,25 +172,25 @@@ contrib
    netbox:
      enabled: false
  consul: 
 -  enabled: true
 +  enabled: false
    consul-server:
      replicaCount: 1
  cps: 
    enabled: false
  dcaegen2: 
 -  enabled: true
 +  enabled: false
    dcae-bootstrap:
      enabled: false
    dcae-cloudify-manager:
 -    enabled: true
 +    enabled: false
    dcae-config-binding-service:
 -    enabled: true
 +    enabled: false
    dcae-dashboard:
      enabled: false
    dcae-deployment-handler:
      enabled: false
    dcae-healthcheck:
 -    enabled: true
 +    enabled: false
    dcae-inventory-api:
      enabled: false
    dcae-policy-handler:
@@@ -248,6 -248,26 +248,6 @@@ holmes
    enabled: false 
  dmaap: 
    enabled: true 
 -  message-router:
 -    message-router-zookeeper:
 -      replicaCount: 1
 -      zookeeperServers: 1
 -    message-router-kafka:
 -      zookeeper:
 -        replicaCount: 1
 -      replicaCount: 1
 -      defaultpartitions: 1
 -      configurationOverrides:
 -        "offsets.topic.replication.factor": "1"
 -        "log.dirs": "/var/lib/kafka/data"
 -        "log.retention.hours": "168"
 -        "num.partitions": "1"
 -        "transaction.state.log.replication.factor": "1"
 -        "transaction.state.log.min.isr": "1"
 -        "num.recovery.threads.per.data.dir": "5"
 -        "zookeeper.connection.timeout.ms": "6000"
 -        "default.replication.factor": "1"
 -        "zookeeper.set.acl": "true"
  
  esr: 
    enabled: false 
@@@ -269,7 -289,7 +269,7 @@@ nbi
  oof:
    enabled: false
  platform:
 -  enabled: true
 +  enabled: false
  policy:
    enabled: true
    policy-api:
@@@ -291,7 -311,7 +291,7 @@@
    policy-clamp-ac-k8s-ppnt:
      enabled: true
    policy-gui:
 -    enabled: true
 +    enabled: false
    policy-nexus:
      enabled: false
    policy-clamp-ac-pf-ppnt:
@@@ -342,11 -362,6 +342,6 @@@ sdnc
      enabled: true
    cds:
      enabled: false
-   sdnc-web:
-     config:
-       topologyserver:
-         enabled: true
-         topologyserverUrl: http://topology.nonrtric:3001
    config:
      sdnr:
        enabled: true
@@@ -372,8 -387,6 +367,8 @@@
          eventLogMsgDetail: LONG
  sniro-emulator:
    enabled: false
 +strimzi:
 +  enabled: true
  so: 
    enabled: false
    so-catalog-db-adapter: