Merge "[DOC] Update the London OOM Guides"

4 files changed, 29 insertions, 76 deletions

diff --git a/docs/sections/resources/csv/nodeports.csv b/docs/sections/resources/csv/nodeports.csv
index b1c6fb5333..096e25eada 100644
--- a/docs/sections/resources/csv/nodeports.csv
+++ b/docs/sections/resources/csv/nodeports.csv
@@ -1,35 +1,21 @@
 NodePort,Component,Service name,targetPort,Port
-30200,VID,vid,8443,8443
 30201,SDNC,sdnc-portal,8443,8443
 30203,SDNC,sdnc-dgbuilder,3100,3000
 30204,SDC,sdc-be-external,8443,8443
 30207,SDC,sdc-fe,9443,9443
 30209,ROBOT,robot,443,443
 30210,AAI,aai-modelloader,8080,8080
-30211,APPC,appc,9191,9090
-30212,PORTAL,portal-sdk,8443,8443
 30218,POLICY,pap,9091,9091
 30219,POLICY,pap,8443,8443
 30220,AAI,aai-sparky-be,8000,8000
-30222,DCAE,xdcae-hv-ves-collector,6061,6061
-30225,PORTAL,portal-app,8443,8443
+30222,DCAE,dcae-hv-ves-collector,6061,6061
 30226,DMAAP,message-router-external,3905,3905
-30228,APPC,appc-dgbuilder,3100,3000
 30229,AAI,aai-modelloader,8443,8443
-30230,APPC,appc,8443,8443
-30231,APPC,appc,1830,1830
 30233,AAI,aai,8443,8443
-30234,POMBA*),pomba-kibana,5601,5601
 30242,DMAAP,dmaap-bc,8443,8443
 30248,OOF,oof-osdf,8699,8698
-30249,POMBA*),pomba-data-router,9502,9502
-30251,AAF,aaf-gui,8200,8200
-30253,LOG*),log-kibana,5601,5601
-30254,LOG*),log-es,9200,9200
-30255,LOG*),log-ls,5044,5044
 30256,SDC,sdc-wfd-fe,8443,8443
 30257,SDC,sdc-wfd-be,8443,8443
-30258,CLAMP,clamp-external,2443,2443
 30260,CLI,cli,443,443
 30264,DCAE,sdc-dcae-fe,9444,9444
 30266,DCAE,sdc-dcae-dt,9446,9446
@@ -42,19 +28,13 @@ NodePort,Component,Service name,targetPort,Port
 30279,AAI,aai-babel,9516,9516
 30283,MSB,msb-iag,443,443
 30284,MSB,msb-eag,443,443
-30288,SNIRO*),sniro-emulator,9999,80
-30289,APPC,appc-cdt,18080,18080
-30290,CLAMP,cdash-kibana,5601,5601
 30297,VNFSDK,refrepo,8703,8703
-30299,POMBA*),pomba-networkdiscovery,8443,9531
 30398,UUI,uui,8443,8443
 30399,UUI,uui-server,8082,8082
 30406,SO,so-vnfm-adapter,9092,9092
 30407,MUSIC,music,8443,8443
 30417,DCAE,xdcae-ves-collector,8443,8443
 30418,DCAE,dashboard,8443,8443
-30420,NETBOX,netbox-nginx,8080,8080
-30478,AWX,awx-web,8080,80
 30490,DMAAP,message-router-kafka-0,9091,9091
 30491,DMAAP,message-router-kafka-1,9091,9091
 30492,DMAAP,message-router-kafka-2,9091,9091
diff --git a/docs/sections/resources/helm/helm-search.txt b/docs/sections/resources/helm/helm-search.txt
index 76b8617175..fbca944bf9 100644
--- a/docs/sections/resources/helm/helm-search.txt
+++ b/docs/sections/resources/helm/helm-search.txt
@@ -1,41 +1,29 @@
 NAME                    CHART VERSION    APP VERSION    DESCRIPTION
-local/onap                    11.0.0     Kohn           Open Network Automation Platform (ONAP)
-local/aaf                     11.0.0                    ONAP Application Authorization Framework
-local/aai                     11.0.0                    ONAP Active and Available Inventory
-local/cassandra               11.0.0                    ONAP cassandra
-local/cds                     11.0.0                    ONAP Controller Design Studio (CDS)
-local/clamp                   11.0.0                    ONAP Clamp
-local/cli                     11.0.0                    ONAP Command Line Interface
-local/common                  11.0.0                    Common templates for inclusion in other charts
-local/consul                  11.0.0                    ONAP Consul Agent
-local/contrib                 11.0.0                    ONAP optional tools
-local/cps                     11.0.0                    ONAP Configuration Persistene Service (CPS)
-local/dcaegen2                11.0.0                    ONAP DCAE Gen2
-local/dgbuilder               11.0.0                    D.G. Builder application
-local/dmaap                   11.0.0                    ONAP DMaaP components
-local/log                     11.0.0                    ONAP Logging ElasticStack
-local/mariadb-galera          11.0.0                    Chart for MariaDB Galera cluster
-local/mongo                   11.0.0                    MongoDB Server
-local/msb                     11.0.0                    ONAP MicroServices Bus
-local/multicloud              11.0.0                    ONAP multicloud broker
-local/music                   11.0.0                    MUSIC - Multi-site State Coordination Service
-local/mysql                   11.0.0                    MySQL Server
-local/nbi                     11.0.0                    ONAP Northbound Interface
-local/network-name-gen        11.0.0                    Name Generation Micro Service
-local/nfs-provisioner         11.0.0                    NFS provisioner
-local/oof                     11.0.0                    ONAP Optimization Framework
-local/policy                  11.0.0                    ONAP Policy Administration Point
-local/pomba                   11.0.0                    ONAP Post Orchestration Model Based Audit
-local/portal                  11.0.0                    ONAP Web Portal
-local/postgres                11.0.0                    ONAP Postgres Server
-local/robot                   11.0.0                    A helm Chart for kubernetes-ONAP Robot
-local/sdc                     11.0.0                    Service Design and Creation Umbrella Helm charts
-local/sdnc                    11.0.0                    SDN Controller
-local/sdnc-prom               11.0.0                    ONAP SDNC Policy Driven Ownership Management
-local/sniro-emulator          11.0.0                    ONAP Mock Sniro Emulator
-local/so                      11.0.0                    ONAP Service Orchestrator
-local/strimzi                 11.0.0                    ONAP Strimzi Apache Kafka
-local/uui                     11.0.0                    ONAP uui
-local/vfc                     11.0.0                    ONAP Virtual Function Controller (VF-C)
-local/vid                     11.0.0                    ONAP Virtual Infrastructure Deployment
-local/vnfsdk                  11.0.0                    ONAP VNF SDK
+local/onap                    12.0.0     London         Open Network Automation Platform (ONAP)
+local/a1policymanagement      12.0.0                    ONAP A1 Policy Management
+local/aai                     12.0.0                    ONAP Active and Available Inventory
+local/cassandra               12.0.0                    ONAP cassandra
+local/cds                     12.0.0                    ONAP Controller Design Studio (CDS)
+local/cli                     12.0.0                    ONAP Command Line Interface
+local/common                  12.0.0                    Common templates for inclusion in other charts
+local/cps                     12.0.0                    ONAP Configuration Persistene Service (CPS)
+local/dcaegen2                12.0.0                    ONAP DCAE Gen2
+local/dmaap                   12.0.0                    ONAP DMaaP components
+local/mariadb-galera          12.0.0                    Chart for MariaDB Galera cluster
+local/msb                     12.0.0                    ONAP MicroServices Bus
+local/multicloud              12.0.0                    ONAP multicloud broker
+local/nbi                     12.0.0                    ONAP Northbound Interface
+local/nfs-provisioner         12.0.0                    NFS provisioner
+local/oof                     12.0.0                    ONAP Optimization Framework
+local/policy                  12.0.0                    ONAP Policy Administration Point
+local/postgres                12.0.0                    ONAP Postgres Server
+local/robot                   12.0.0                    A helm Chart for kubernetes-ONAP Robot
+local/sdc                     12.0.0                    Service Design and Creation Umbrella Helm charts
+local/sdnc                    12.0.0                    SDN Controller
+local/sdnc-prom               12.0.0                    ONAP SDNC Policy Driven Ownership Management
+local/sniro-emulator          12.0.0                    ONAP Mock Sniro Emulator
+local/so                      12.0.0                    ONAP Service Orchestrator
+local/strimzi                 12.0.0                    ONAP Strimzi Apache Kafka
+local/uui                     12.0.0                    ONAP uui
+local/vfc                     12.0.0                    ONAP Virtual Function Controller (VF-C)
+local/vnfsdk                  12.0.0                    ONAP VNF SDK
diff --git a/docs/sections/resources/yaml/environments_onap_demo.yaml b/docs/sections/resources/yaml/environments_onap_demo.yaml
index 88befa238b..492e5d2ff1 100644
--- a/docs/sections/resources/yaml/environments_onap_demo.yaml
+++ b/docs/sections/resources/yaml/environments_onap_demo.yaml
@@ -32,34 +32,22 @@ global:
 # Enable/disable and configure helm charts (ie. applications)
 # to customize the ONAP deployment.
 #################################################################
-aaf:
-  enabled: false
 aai:
   enabled: false
-clamp:
-  enabled: true
 cli:
   enabled: false
-consul: # Consul Health Check Monitoring
-  enabled: false
 cps:
   enabled: false
 dcaegen2:
   enabled: false
-log:
-  enabled: false
 message-router:
   enabled: false
-mock:
-  enabled: false
 msb:
   enabled: false
 multicloud:
   enabled: false
 policy:
   enabled: false
-portal:
-  enabled: false
 robot: # Robot Health Check
   enabled: true
 sdc:
@@ -95,7 +83,5 @@ uui:
   enabled: false
 vfc:
   enabled: false
-vid:
-  enabled: false
 vnfsdk:
   enabled: false
diff --git a/docs/sections/resources/yaml/istiod.yaml b/docs/sections/resources/yaml/istiod.yaml
index 47380125b8..792f686cc6 100644
--- a/docs/sections/resources/yaml/istiod.yaml
+++ b/docs/sections/resources/yaml/istiod.yaml
@@ -17,5 +17,4 @@ meshConfig:
       headersToDownstreamOnDeny: ["content-type", "set-cookie"]
 pilot:
   env:
-    PILOT_ENABLE_MYSQL_FILTER: true
     PILOT_HTTP10: true
\ No newline at end of file