diff options
| -rw-r--r-- | compose/config/drools-applications/env/base.conf | 6 | ||||
| -rw-r--r-- | compose/config/drools-applications/env/feature-pooling-messages.conf (renamed from compose/config/drools-applications/env/feature-pooling-kafka.conf) | 0 | ||||
| -rw-r--r-- | compose/config/drools-pdp/env/base.conf | 8 | ||||
| -rw-r--r-- | compose/config/xacml-pdp/defaultConfig.json | 4 | ||||
| -rw-r--r-- | compose/docker-compose.yml | 9 | ||||
| -rwxr-xr-x | csit/resources/scripts/setup-drools-applications.sh | 2 | ||||
| -rwxr-xr-x | csit/run-project-csit.sh | 1 | ||||
| -rw-r--r-- | helm/policy/components/policy-drools-pdp/templates/statefulset.yaml | 8 |
8 files changed, 13 insertions, 25 deletions
diff --git a/compose/config/drools-applications/env/base.conf b/compose/config/drools-applications/env/base.conf index 76e42570..7f213ead 100644 --- a/compose/config/drools-applications/env/base.conf +++ b/compose/config/drools-applications/env/base.conf @@ -55,12 +55,6 @@ JDBC_URL=jdbc:mariadb://mariadb:3306/ JDBC_OPTS= MYSQL_CMD= -# AAF - -AAF=false -AAF_NAMESPACE=org.onap.policy -AAF_HOST=aaf.api.simpledemo.onap.org - # HTTP Servers HTTP_SERVER_HTTPS=false diff --git a/compose/config/drools-applications/env/feature-pooling-kafka.conf b/compose/config/drools-applications/env/feature-pooling-messages.conf index f90a9f04..f90a9f04 100644 --- a/compose/config/drools-applications/env/feature-pooling-kafka.conf +++ b/compose/config/drools-applications/env/feature-pooling-messages.conf diff --git a/compose/config/drools-pdp/env/base.conf b/compose/config/drools-pdp/env/base.conf index 2625b76d..a0b2a923 100644 --- a/compose/config/drools-pdp/env/base.conf +++ b/compose/config/drools-pdp/env/base.conf @@ -55,13 +55,6 @@ JDBC_URL=jdbc:mariadb://mariadb:3306/ JDBC_OPTS= MYSQL_CMD= - -# AAF - -AAF=false -AAF_NAMESPACE=org.onap.policy -AAF_HOST=aaf.api.simpledemo.onap.org - # HTTP Servers HTTP_SERVER_HTTPS=false @@ -110,7 +103,6 @@ DCAE_CONSUMER_GROUP=dcae.policy.shared KAFKA_SERVERS=kafka:9092 - # AAI AAI_HOST=aai.api.simpledemo.onap.org diff --git a/compose/config/xacml-pdp/defaultConfig.json b/compose/config/xacml-pdp/defaultConfig.json index ba587f1a..6c72498d 100644 --- a/compose/config/xacml-pdp/defaultConfig.json +++ b/compose/config/xacml-pdp/defaultConfig.json @@ -8,7 +8,6 @@ "userName": "policyadmin", "password": "zb!XztG34", "https": false, - "aaf": false, "prometheus": true }, "policyApiParameters": { @@ -16,8 +15,7 @@ "port": 6969, "userName": "policyadmin", "password": "zb!XztG34", - "useHttps": false, - "aaf": false + "useHttps": false }, "applicationParameters": { "applicationPath": "/opt/app/policy/pdpx/apps" diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 0264b290..3d7c1462 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -177,7 +177,7 @@ services: env_file: - ./config/drools-applications/env/base.conf - ./config/drools-applications/env/feature-healthcheck.conf - - ./config/drools-applications/env/feature-pooling-kafka.conf + - ./config/drools-applications/env/feature-pooling-messages.conf entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ '-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot', @@ -392,11 +392,12 @@ services: zookeeper: image: confluentinc/cp-zookeeper:latest + container_name: zookeeper environment: ZOOKEEPER_CLIENT_PORT: 2181 ZOOKEEPER_TICK_TIME: 2000 ports: - - 2181:2181 + - "2181:2181" kafka: image: confluentinc/cp-kafka:latest @@ -404,8 +405,8 @@ services: depends_on: - zookeeper ports: - - 29092:29092 - - 9092:9092 + - "29092:29092" + - "9092:9092" environment: KAFKA_BROKER_ID: 1 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 diff --git a/csit/resources/scripts/setup-drools-applications.sh b/csit/resources/scripts/setup-drools-applications.sh index 94272e3c..bfb3f67d 100755 --- a/csit/resources/scripts/setup-drools-applications.sh +++ b/csit/resources/scripts/setup-drools-applications.sh @@ -29,7 +29,9 @@ export SUITES="drools-applications-test.robot" export KAFKA_IP="localhost:${KAFKA_PORT}" # wait for the app to start up +"${SCRIPTS}"/wait_for_rest.sh localhost ${PAP_PORT} "${SCRIPTS}"/wait_for_rest.sh localhost ${DROOLS_APPS_PORT} +"${SCRIPTS}"/wait_for_rest.sh localhost ${DROOLS_APPS_TELEMETRY_PORT} # give enough time for the controllers to come up sleep 15 diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh index 32f80b63..07a3424c 100755 --- a/csit/run-project-csit.sh +++ b/csit/run-project-csit.sh @@ -34,6 +34,7 @@ function on_exit(){ docker_stats source_safely ${WORKSPACE}/compose/stop-compose.sh + rsync "${WORKSPACE}/compose/docker_compose.log" "${WORKSPACE}/csit/archives/${PROJECT}" if [[ ${WORKDIR} ]]; then rsync -av "${WORKDIR}/" "${WORKSPACE}/csit/archives/${PROJECT}" diff --git a/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml b/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml index de14c4b3..7ada63ad 100644 --- a/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml +++ b/helm/policy/components/policy-drools-pdp/templates/statefulset.yaml @@ -104,9 +104,9 @@ spec: - mountPath: /tmp/policy-install/config/engine-system.properties name: drools-config subPath: engine-system.properties - - mountPath: /tmp/policy-install/config/feature-pooling-kafka.conf + - mountPath: /tmp/policy-install/config/feature-pooling-messages.conf name: drools-config - subPath: feature-pooling-kafka.conf + subPath: feature-pooling-messages.conf - mountPath: /tmp/policy-install/config/logback.xml name: drools-config subPath: logback.xml @@ -133,8 +133,8 @@ spec: - key: engine-system.properties path: engine-system.properties mode: 0755 - - key: feature-pooling-kafka.conf - path: feature-pooling-kafka.conf + - key: feature-pooling-messages.conf + path: feature-pooling-messages.conf mode: 0755 - key: logback.xml path: logback.xml |