6 files changed, 7 insertions, 22 deletions
diff --git a/compose/config/clamp/SimulatorParticipantParameters.yaml b/compose/config/clamp/SimulatorParticipantParameters.yaml
index 16234e17..acc1db66 100644
--- a/compose/config/clamp/SimulatorParticipantParameters.yaml
+++ b/compose/config/clamp/SimulatorParticipantParameters.yaml
@@ -47,4 +47,4 @@ server:
   ssl:
     enabled: false
   servlet:
-    context-path: /onap/policy/clamp/acm/simparticipant
+    context-path: /onap/policy/simparticipant
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 60ed0bc7..d5c6c3b2 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -198,7 +198,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',
@@ -413,11 +413,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
@@ -425,8 +426,8 @@ services:
      depends_on:
        - zookeeper
      ports:
-       - 29092:29092
-       - 9092:9092
+       - "29092:29092"
+       - "9092:9092"
      environment:
        KAFKA_BROKER_ID: 1
        KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181