diff options
4 files changed, 40 insertions, 14 deletions
diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties index cb31e8f0..5aaae4a1 100644 --- a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties +++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties @@ -24,6 +24,8 @@ http.server.services.HEALTHCHECK.port=6969 http.server.services.HEALTHCHECK.restClasses=org.onap.policy.drools.healthcheck.RestHealthCheck http.server.services.HEALTHCHECK.managed=false http.server.services.HEALTHCHECK.swagger=true +http.server.services.HEALTHCHECK.userName=${{HEALTHCHECK_USER}} +http.server.services.HEALTHCHECK.password=${{HEALTHCHECK_PASSWORD}} http.client.services=PAP,PDP diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index b33cf586..d92abed0 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -18,14 +18,20 @@ # ============LICENSE_END========================================================= ### +# SYSTEM software configuration + POLICY_HOME=/opt/app/policy JAVA_HOME=/opt/jdk1.8.0_77 M2_HOME=/opt/app/policy/3rdparty/apache-maven-3.3.1 +# Telemetry credentials + ENGINE_MANAGEMENT_PORT=9696 ENGINE_MANAGEMENT_HOST=0.0.0.0 -ENGINE_MANAGEMENT_USER=@1b3rt -ENGINE_MANAGEMENT_PASSWORD=31nst31n +ENGINE_MANAGEMENT_USER= +ENGINE_MANAGEMENT_PASSWORD= + +# nexus repository # To use a Nexus repository for rules artifacts, # following properties must be uncommented and set: @@ -34,7 +40,15 @@ ENGINE_MANAGEMENT_PASSWORD=31nst31n #repositoryUsername=(nexus username goes here) #repositoryPassword=(password goes here) -PDPD_CONFIGURATION_TOPIC=PDPD_CONFIGURATION +# Relational (SQL) DB access + +SQL_HOST= +SQL_USER= +SQL_PASSWORD= + +# PDP-D DMaaP configuration channel + +PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION PDPD_CONFIGURATION_SERVERS= PDPD_CONFIGURATION_API_KEY= PDPD_CONFIGURATION_API_SECRET= @@ -42,10 +56,23 @@ PDPD_CONFIGURATION_CONSUMER_GROUP= PDPD_CONFIGURATION_CONSUMER_INSTANCE= PDPD_CONFIGURATION_PARTITION_KEY= +# PAP + PAP_HOST= PAP_USERNAME= PAP_PASSWORD= +# PDP-X + PDP_HOST= PDP_USERNAME= PDP_PASSWORD= + +# DCAE DMaaP + +DCAE_TOPIC= +DCAE_SERVERS= + +# Open DMaaP + +DMAAP_SERVERS= diff --git a/packages/install/src/files/feature-healthcheck.conf b/packages/install/src/files/feature-healthcheck.conf new file mode 100644 index 00000000..f5c3d071 --- /dev/null +++ b/packages/install/src/files/feature-healthcheck.conf @@ -0,0 +1,2 @@ +HEALTHCHECK_USER= +HEALTHCHECK_PASSWORD= diff --git a/policy-management/src/assembly/assemble_zip.xml b/policy-management/src/assembly/assemble_zip.xml index a9108257..216376fd 100644 --- a/policy-management/src/assembly/assemble_zip.xml +++ b/policy-management/src/assembly/assemble_zip.xml @@ -24,7 +24,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>runtime</id> + <id>pdpd</id> <formats> <format>zip</format> </formats> @@ -42,8 +42,7 @@ <fileSet> <directory>target/assembly/</directory> <outputDirectory>.</outputDirectory> - <excludes> - </excludes> + <excludes/> </fileSet> <fileSet> <directory>.</directory> @@ -67,17 +66,13 @@ </excludes> </fileSet> <fileSet> - <directory>src/main/server-gen/scripts</directory> - <outputDirectory>scripts</outputDirectory> - </fileSet> - <fileSet> - <directory>src/main/server/scripts</directory> - <outputDirectory>scripts</outputDirectory> - </fileSet> - <fileSet> <directory>src/main/server/config</directory> <outputDirectory>config</outputDirectory> </fileSet> + <fileSet> + <directory>src/main/server/db</directory> + <outputDirectory>etc/db</outputDirectory> + </fileSet> </fileSets> </assembly> |