diff options
| -rw-r--r-- | config/drools/base.conf | 9 | ||||
| -rw-r--r-- | config/pe/brmsgw.conf | 7 | ||||
| -rw-r--r-- | docker-compose-integration.yml | 56 | ||||
| -rw-r--r-- | policy-drools/do-start.sh | 4 | ||||
| -rw-r--r-- | policy-drools/docker-install.sh | 1 |
5 files changed, 62 insertions, 15 deletions
diff --git a/config/drools/base.conf b/config/drools/base.conf index a9527b91..434e6e89 100644 --- a/config/drools/base.conf +++ b/config/drools/base.conf @@ -68,6 +68,9 @@ PAP_PASSWORD=alpha123 PDP_HOST=pdp PDP_USERNAME=testpdp PDP_PASSWORD=alpha123 +PDP_CLIENT_USERNAME=python +PDP_CLIENT_PASSWORD=test +PDP_ENVIRONMENT=TEST # DCAE DMaaP @@ -95,9 +98,3 @@ SO_PASSWORD=password1$ VFC_URL= VFC_USERNAME= VFC_PASSWORD= - -# GUARD - -GUARD_URL= -GUARD_USERNAME= -GUARD_PASSWORD= diff --git a/config/pe/brmsgw.conf b/config/pe/brmsgw.conf index 8b884dae..3e40edba 100644 --- a/config/pe/brmsgw.conf +++ b/config/pe/brmsgw.conf @@ -28,11 +28,8 @@ UEB_API_SECRET= groupID=org.onap.policy-engine artifactID=drlPDPGroup -VFW_GROUP_ID=org.onap.policy-engine.drools.vFW -VFW_ARTIFACT_ID=policy-vFW-rules -VDNS_GROUP_ID=org.onap.policy-engine.drools.vDNS -VDNS_ARTIFACT_ID=policy-vDNS-rules - +AMSTERDAM_GROUP_ID=org.onap.policy-engine.drools.amsterdam +AMSTERDAM_ARTIFACT_ID=policy-amsterdam-rules # the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase resource_name=brmsgw_1 diff --git a/docker-compose-integration.yml b/docker-compose-integration.yml new file mode 100644 index 00000000..5d1056c8 --- /dev/null +++ b/docker-compose-integration.yml @@ -0,0 +1,56 @@ +version: '2' +services: + mariadb: + image: onap/policy/policy-db + container_name: mariadb + hostname: mariadb + expose: + - 3306 + nexus: + image: onap/policy/policy-nexus + container_name: nexus + hostname: nexus + pap: + image: onap/policy/policy-pe + container_name: pap + depends_on: + - mariadb + hostname: pap + expose: + - 8443 + - 9091 + command: pap + volumes: + - ./config/pe:/tmp/policy-install/config + pdp: + image: onap/policy/policy-pe + container_name: pdp + depends_on: + - pap + hostname: pdp + expose: + - 8081 + command: pdp + volumes: + - ./config/pe:/tmp/policy-install/config + brmsgw: + image: onap/policy/policy-pe + container_name: brmsgw + depends_on: + - pap + hostname: brmsgw + command: brmsgw + volumes: + - ./config/pe:/tmp/policy-install/config + drools: + image: onap/policy/policy-drools + container_name: drools + depends_on: + - mariadb + - nexus + hostname: drools + expose: + - 6969 + - 9696 + volumes: + - ./config/drools:/tmp/policy-install/config diff --git a/policy-drools/do-start.sh b/policy-drools/do-start.sh index 450fe872..e1857441 100644 --- a/policy-drools/do-start.sh +++ b/policy-drools/do-start.sh @@ -23,9 +23,6 @@ else mkdir -p $POLICY_HOME/etc/ssl cp config/policy-keystore $POLICY_HOME/etc/ssl - # this should probably be done by install.sh - mvn install:install-file archetype:crawl -Dfile="archetype-closedloop-demo-rules-1.0.0-SNAPSHOT.jar" -DgroupId=org.onap.policy.archetype -DartifactId=archetype-closedloop-demo-rules -Dversion="1.0.0-SNAPSHOT" -Dpackaging=jar -DgeneratePom=true -DupdateReleaseInfo=true - if [[ -x config/drools-tweaks.sh ]] ; then echo "Executing tweaks" # file may not be executable; running it as an @@ -35,6 +32,7 @@ else # wait for DB up ./wait-for-port.sh mariadb 3306 + # now that DB is up, invoke database upgrade: # sql provisioning scripts should be invoked here. fi diff --git a/policy-drools/docker-install.sh b/policy-drools/docker-install.sh index de2d7070..e65329da 100644 --- a/policy-drools/docker-install.sh +++ b/policy-drools/docker-install.sh @@ -881,7 +881,6 @@ function do_install() # base drools installation from the drools apps # is executed here - chmod +x ./apps-installer ./apps-installer fi |