Merge "use encrypted auth for dmaap"

diff --combined kubernetes/so/resources/config/overrides/override.yaml
index e4542a2,2000193..44efb4d
--- 1/kubernetes/so/resources/config/overrides/override.yaml
--- 2/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@@ -30,14 -30,14 +30,14 @@@ mso
            default:
              testApi: GR_API
    camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/
 -  camundaAuth: 1D9003AB8BAFFA0D2104B67FA89040AD70B5B495B2A5DF931DE236484EBC1681
 +  camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
    async:
      core-pool-size: 50
      max-pool-size: 50
      queue-capacity: 500
    sdc:
      client:
 -      auth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
 +      auth: 878785F4F31BC9CFA5AB52A172008212D8845ED2DE08AD5E56AF114720A4E49768B8F95CDA2EB971765D28EDCDAA24
      activate:
        instanceid: test
        userid: cs0008
@@@ -48,16 -48,34 +48,17 @@@
          count: 3
    aai:
      endpoint: https://aai.{{ include "common.namespace" . }}:8443
 -    auth: 2630606608347B7124C244AB0FE34F6F
 +    auth: 6E081E10B1CA43A843E303733A74D9B23B601A6E22A21C7EF2C7F15A42F81A1A4E85E65268C2661F71321052C7F3E55B96A8E1E951F8BF6F
    so:
      operational-environment:
        dmaap:
          username: testuser
          password: VjR5NDcxSzA=
          host: http://dmaap-bc.{{ include "common.namespace" . }}:8080
+         auth: 51EA5414022D7BE536E7516C4D1A6361416921849B72C0D6FC1C7F262FD9F2BBC2AD124190A332D9845A188AD80955567A4F975C84C221EEA8243BFD92FFE6896CDD1EA16ADD34E1E3D47D4A
        publisher:
          topic: com.att.ecomp.mso.operationalEnvironmentEvent
  spring:
 -  datasource:
 -    jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
 -    username: ${DB_USERNAME}
 -    password: ${DB_PASSWORD}
 -    driver-class-name: org.mariadb.jdbc.Driver
 -    dbcp2:
 -      initial-size: 5
 -      max-total: 20
 -      validation-query: select 1
 -      test-on-borrow: true
 -  jpa:
 -      show-sql: true
 -      hibernate:
 -        dialect: org.hibernate.dialect.MySQL5Dialect
 -        ddl-auto: validate
 -        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
 -        enable-lazy-load-no-trans: true
    jersey:
      type: filter
    security:
@@@ -92,10 -110,8 +93,10 @@@ request
      username: ${DB_USERNAME}
      password: ${DB_PASSWORD}
      driver-class-name: org.mariadb.jdbc.Driver
 -    dbcp2:
 -      initial-size: 5
 -      max-total: 20
 -      validation-query: select 1
 -      test-on-borrow: true
 +org:
 +  onap:
 +    so:
 +      cloud-owner: onap
 +      adapters:
 +        network:
 +          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7