diff options
author | liamfallon <liam.fallon@est.tech> | 2022-10-18 14:04:06 +0100 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2022-10-18 14:04:09 +0100 |
commit | 8d3f1294010a78b5a25a115dddb2c64cf018379c (patch) | |
tree | 7cc9b4864611993d410a31361d04f7d4c19c4df3 /csit/config | |
parent | b7a9c405de95315ce38b4913a1efee9bfd03fe04 (diff) |
Fix CSITs for Kohn release
Newer versions of dependencies brought in some small updates to
configuraiton.
Also a script called start-container.sh has been added to bring up a
single Policy Framework container and its dependencies.
Issue-ID: POLICY-4393
Change-Id: I17bac4d75600431fdee74592be4700761a3f8fe7
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'csit/config')
-rw-r--r-- | csit/config/apex-pdp/OnapPfConfig.json | 2 | ||||
-rw-r--r-- | csit/config/clamp/HttpParticipantParameters.yaml | 5 | ||||
-rw-r--r-- | csit/config/clamp/KubernetesParticipantParameters.yaml | 5 | ||||
-rw-r--r-- | csit/config/clamp/PolicyParticipantParameters.yaml | 6 | ||||
-rw-r--r-- | csit/config/distribution/defaultConfig.json | 2 | ||||
-rw-r--r-- | csit/config/drools-applications/env/base.conf | 4 | ||||
-rw-r--r-- | csit/config/drools-pdp/env/base.conf | 2 | ||||
-rw-r--r-- | csit/config/xacml-pdp/defaultConfig.json | 2 |
8 files changed, 21 insertions, 7 deletions
diff --git a/csit/config/apex-pdp/OnapPfConfig.json b/csit/config/apex-pdp/OnapPfConfig.json index 5760259b..57ca7200 100644 --- a/csit/config/apex-pdp/OnapPfConfig.json +++ b/csit/config/apex-pdp/OnapPfConfig.json @@ -3,7 +3,7 @@ "restServerParameters": { "host": "0.0.0.0", "port": 6969, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34", "https": false, "prometheus": true diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml index 15768882..038e97af 100644 --- a/csit/config/clamp/HttpParticipantParameters.yaml +++ b/csit/config/clamp/HttpParticipantParameters.yaml @@ -3,6 +3,11 @@ spring: user: name: participantUser password: zb!XztG34 + autoconfigure: + exclude: > + org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, + org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, + org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration security: enable-csrf: false participant: diff --git a/csit/config/clamp/KubernetesParticipantParameters.yaml b/csit/config/clamp/KubernetesParticipantParameters.yaml index c13f8151..d9c3326f 100644 --- a/csit/config/clamp/KubernetesParticipantParameters.yaml +++ b/csit/config/clamp/KubernetesParticipantParameters.yaml @@ -3,6 +3,11 @@ spring: user: name: participantUser password: zb!XztG34 + autoconfigure: + exclude: > + org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, + org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, + org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration security: enable-csrf: false diff --git a/csit/config/clamp/PolicyParticipantParameters.yaml b/csit/config/clamp/PolicyParticipantParameters.yaml index acaaebbe..8db98a78 100644 --- a/csit/config/clamp/PolicyParticipantParameters.yaml +++ b/csit/config/clamp/PolicyParticipantParameters.yaml @@ -3,7 +3,11 @@ spring: user: name: participantUser password: zb!XztG34 - + autoconfigure: + exclude: > + org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, + org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, + org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration participant: pdpGroup: defaultGroup pdpType: apex diff --git a/csit/config/distribution/defaultConfig.json b/csit/config/distribution/defaultConfig.json index 7f09c6b4..c8451eba 100644 --- a/csit/config/distribution/defaultConfig.json +++ b/csit/config/distribution/defaultConfig.json @@ -3,7 +3,7 @@ "restServerParameters":{ "host":"0.0.0.0", "port":6969, - "userName":"healthcheck", + "userName":"policyadmin", "password":"zb!XztG34", "https": false, "prometheus": true diff --git a/csit/config/drools-applications/env/base.conf b/csit/config/drools-applications/env/base.conf index 68ac61fc..ca944dbb 100644 --- a/csit/config/drools-applications/env/base.conf +++ b/csit/config/drools-applications/env/base.conf @@ -96,7 +96,7 @@ GUARD_DISABLED=false PDP_HOST=policy-xacml-pdp PDP_PORT=6969 PDP_CONTEXT_URI=policy/pdpx/v1/ -PDP_USERNAME=healthcheck +PDP_USERNAME=policyadmin PDP_PASSWORD=zb!XztG34 PDP_HTTPS=false @@ -127,7 +127,7 @@ SO_PORT=6669 SO_CONTEXT_URI= SO_URL=http://message-router:6669/ SO_USERNAME=InfraPortalClient -SO_PASSWORD=password1$ +SO_PASSWORD='password1$' # VFC diff --git a/csit/config/drools-pdp/env/base.conf b/csit/config/drools-pdp/env/base.conf index 3b8160e6..98cc10f8 100644 --- a/csit/config/drools-pdp/env/base.conf +++ b/csit/config/drools-pdp/env/base.conf @@ -125,7 +125,7 @@ SO_PORT=8080 SO_CONTEXT_URI=onap/so/infra/ SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra SO_USERNAME=InfraPortalClient -SO_PASSWORD=password1$ +SO_PASSWORD='password1$' # VFC diff --git a/csit/config/xacml-pdp/defaultConfig.json b/csit/config/xacml-pdp/defaultConfig.json index a4bcc5ed..d6f3bd99 100644 --- a/csit/config/xacml-pdp/defaultConfig.json +++ b/csit/config/xacml-pdp/defaultConfig.json @@ -5,7 +5,7 @@ "restServerParameters": { "host": "0.0.0.0", "port": 6969, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34", "https": false, "aaf": false, |