diff options
Diffstat (limited to 'datarouter-prov/src/main/resources')
| -rw-r--r-- | datarouter-prov/src/main/resources/docker-compose/docker-compose.yml | 76 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/docker-compose/prov_data/addFeed3.txt | 2 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/docker-compose/prov_data/addSubscriber.txt | 6 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties | 6 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/misc/drtrprov | 2 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/misc/mysql_dr_schema.sql | 139 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/misc/notes | 4 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/misc/runreports | 2 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/misc/sql_init_01.sql (renamed from datarouter-prov/src/main/resources/docker-compose/database/install_db.sql) | 87 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/provserver.properties | 6 | ||||
| -rw-r--r-- | datarouter-prov/src/main/resources/startup.sh | 0 |
11 files changed, 112 insertions, 218 deletions
diff --git a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml index 1c33e3b8..eece1554 100644 --- a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml +++ b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml @@ -21,49 +21,77 @@ # *
#-------------------------------------------------------------------------------
version: '2.1'
-services:
+services:
datarouter-prov:
- image: onap/dmaap/datarouter-prov
+ image: nexus3.onap.org:10003/onap/dmaap/datarouter-prov
container_name: datarouter-prov
hostname: prov.datarouternew.com
ports:
- "8443:8443"
- "8080:8080"
-# volumes:
-# - ./prov_data/proserver.properties:/opt/app/datartr/etc/proserver.properties
+ volumes:
+ - ./prov_data/proserver.properties:/opt/app/datartr/etc/proserver.properties
# - ./prov_data/datarouter-prov-jar-with-dependencies.jar:/opt/app/datartr/lib/datarouter-prov-jar-with-dependencies.jar
-# - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
-# - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
- entrypoint: ["bash", "-c", "sleep 10; /bin/sh -c ./startup.sh"]
+ - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
+ - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
+ entrypoint: ["bash", "-c", "./startup.sh"]
depends_on:
- mysql_container:
+ mariadb_container:
condition: service_healthy
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://prov.datarouternew.com:8080/internal/prov"]
+ interval: 10s
+ timeout: 10s
+ retries: 5
extra_hosts:
- - "node.datarouternew.com:172.18.0.4"
-
+ - "node.datarouternew.com:172.100.0.4"
+ networks:
+ testing_net:
+ ipv4_address: 172.100.0.3
+
datarouter-node:
- image: onap/dmaap/datarouter-node
+ image: nexus3.onap.org:10003/onap/dmaap/datarouter-node
container_name: datarouter-node
hostname: node.datarouternew.com
ports:
- "9443:8443"
- "9090:8080"
-# volumes:
-# - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
- entrypoint: ["bash", "-c", "sleep 15; /bin/sh -c ./startup.sh"]
+ volumes:
+ - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
+ entrypoint: ["bash", "-c", "./startup.sh"]
depends_on:
- - datarouter-prov
+ datarouter-prov:
+ condition: service_healthy
extra_hosts:
- - "prov.datarouternew.com:172.18.0.3"
+ - "prov.datarouternew.com:172.100.0.3"
+ networks:
+ testing_net:
+ ipv4_address: 172.100.0.4
- mysql_container:
- image: mysql/mysql-server:5.6
- container_name: mysql
+ mariadb_container:
+ image: mariadb:10.2.14
+ container_name: mariadb
ports:
- "3306:3306"
environment:
- MYSQL_ROOT_PASSWORD: att2017
- volumes:
- - ./database:/tmp/database
- - ./database:/docker-entrypoint-initdb.d
-
+ MYSQL_ROOT_PASSWORD: datarouter
+ MYSQL_DATABASE: datarouter
+ MYSQL_USER: datarouter
+ MYSQL_PASSWORD: datarouter
+ healthcheck:
+ test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+ interval: 10s
+ timeout: 10s
+ retries: 5
+
+ networks:
+ testing_net:
+ ipv4_address: 172.100.0.2
+
+networks:
+ testing_net:
+ driver: bridge
+ ipam:
+ driver: default
+ config:
+ - subnet: 172.100.0.0/16
diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/addFeed3.txt b/datarouter-prov/src/main/resources/docker-compose/prov_data/addFeed3.txt index a21c7ae0..03eabb7d 100644 --- a/datarouter-prov/src/main/resources/docker-compose/prov_data/addFeed3.txt +++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/addFeed3.txt @@ -31,7 +31,7 @@ "authorization": {
"classification": "unclassified",
"endpoint_addrs": [
- "172.18.0.3",
+ "172.100.0.3",
],
"endpoint_ids": [
{
diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/addSubscriber.txt b/datarouter-prov/src/main/resources/docker-compose/prov_data/addSubscriber.txt index e9746311..15ca3095 100644 --- a/datarouter-prov/src/main/resources/docker-compose/prov_data/addSubscriber.txt +++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/addSubscriber.txt @@ -24,9 +24,9 @@ "delivery" :
{
- "url" : "http://172.18.0.3:7070/",
- "user" : "LOGIN",
- "password" : "PASSWORD",
+ "url" : "http://172.100.0.3:7070/",
+ "user" : "datarouter",
+ "password" : "datarouter",
"use100" : true
},
"metadataOnly" : false,
diff --git a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties index b722a640..f37330ae 100644 --- a/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties +++ b/datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties @@ -38,11 +38,11 @@ org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/self org.onap.dmaap.datarouter.provserver.truststore.password = changeit
org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs
org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool
-#org.onap.dmaap.datarouter.provserver.dbscripts = /home/eby/dr2/cvs/datarouter/prov/misc/
+org.onap.dmaap.datarouter.provserver.dbscripts = /opt/app/datartr/etc/misc
org.onap.dmaap.datarouter.provserver.logretention = 30
# Database access
-org.onap.dmaap.datarouter.db.driver = com.mysql.jdbc.Driver
-org.onap.dmaap.datarouter.db.url = jdbc:mysql://172.18.0.2:3306/datarouter
+org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver
+org.onap.dmaap.datarouter.db.url = jdbc:mariadb://172.100.0.2:3306/datarouter
org.onap.dmaap.datarouter.db.login = datarouter
org.onap.dmaap.datarouter.db.password = datarouter
diff --git a/datarouter-prov/src/main/resources/misc/drtrprov b/datarouter-prov/src/main/resources/misc/drtrprov index 2afb6ecb..9f86c23b 100644 --- a/datarouter-prov/src/main/resources/misc/drtrprov +++ b/datarouter-prov/src/main/resources/misc/drtrprov @@ -56,7 +56,7 @@ start() { # fi if [ "`pgrep -u mysql mysqld`" = "" ] then - echo MySQL is not running. It must be started before drtrprov + echo MariaDB is not running. It must be started before drtrprov exit 0 fi PIDS=`pids` diff --git a/datarouter-prov/src/main/resources/misc/mysql_dr_schema.sql b/datarouter-prov/src/main/resources/misc/mysql_dr_schema.sql deleted file mode 100644 index 837030c3..00000000 --- a/datarouter-prov/src/main/resources/misc/mysql_dr_schema.sql +++ /dev/null @@ -1,139 +0,0 @@ -create database datarouter; - -use datarouter; - -CREATE TABLE FEEDS ( - FEEDID INT UNSIGNED NOT NULL PRIMARY KEY, - NAME VARCHAR(20) NOT NULL, - VERSION VARCHAR(20) NOT NULL, - DESCRIPTION VARCHAR(256), - AUTH_CLASS VARCHAR(32) NOT NULL, - PUBLISHER VARCHAR(8) NOT NULL, - SELF_LINK VARCHAR(256), - PUBLISH_LINK VARCHAR(256), - SUBSCRIBE_LINK VARCHAR(256), - LOG_LINK VARCHAR(256), - DELETED BOOLEAN DEFAULT FALSE, - LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP -); - -CREATE TABLE FEED_ENDPOINT_IDS ( - FEEDID INT UNSIGNED NOT NULL, - USERID VARCHAR(20) NOT NULL, - PASSWORD VARCHAR(32) NOT NULL -); - -CREATE TABLE FEED_ENDPOINT_ADDRS ( - FEEDID INT UNSIGNED NOT NULL, - ADDR VARCHAR(44) NOT NULL -); - -CREATE TABLE SUBSCRIPTIONS ( - SUBID INT UNSIGNED NOT NULL PRIMARY KEY, - FEEDID INT UNSIGNED NOT NULL, - DELIVERY_URL VARCHAR(256), - DELIVERY_USER VARCHAR(20), - DELIVERY_PASSWORD VARCHAR(32), - DELIVERY_USE100 BOOLEAN DEFAULT FALSE, - METADATA_ONLY BOOLEAN DEFAULT FALSE, - SUBSCRIBER VARCHAR(8) NOT NULL, - SELF_LINK VARCHAR(256), - LOG_LINK VARCHAR(256), - LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP -); - -CREATE TABLE PARAMETERS ( - KEYNAME VARCHAR(32) NOT NULL PRIMARY KEY, - VALUE VARCHAR(4096) NOT NULL -); - -CREATE TABLE LOG_RECORDS ( - TYPE ENUM('pub', 'del', 'exp') NOT NULL, - EVENT_TIME BIGINT NOT NULL, /* time of the publish request */ - PUBLISH_ID VARCHAR(64) NOT NULL, /* unique ID assigned to this publish attempt */ - FEEDID INT UNSIGNED NOT NULL, /* pointer to feed in FEEDS */ - REQURI VARCHAR(256) NOT NULL, /* request URI */ - METHOD ENUM('DELETE', 'GET', 'HEAD', 'OPTIONS', 'PUT', 'POST', 'TRACE') NOT NULL, /* HTTP method */ - CONTENT_TYPE VARCHAR(256) NOT NULL, /* content type of published file */ - CONTENT_LENGTH BIGINT UNSIGNED NOT NULL, /* content length of published file */ - - FEED_FILEID VARCHAR(128), /* file ID of published file */ - REMOTE_ADDR VARCHAR(40), /* IP address of publishing endpoint */ - USER VARCHAR(20), /* user name of publishing endpoint */ - STATUS SMALLINT, /* status code returned to delivering agent */ - - DELIVERY_SUBID INT UNSIGNED, /* pointer to subscription in SUBSCRIPTIONS */ - DELIVERY_FILEID VARCHAR(128), /* file ID of file being delivered */ - RESULT SMALLINT, /* result received from subscribing agent */ - - ATTEMPTS INT, /* deliveries attempted */ - REASON ENUM('notRetryable', 'retriesExhausted'), - - RECORD_ID BIGINT UNSIGNED NOT NULL PRIMARY KEY, /* unique ID for this record */ - - INDEX (FEEDID) USING BTREE, - INDEX (DELIVERY_SUBID) USING BTREE, - INDEX (RECORD_ID) USING BTREE -) ENGINE = MyISAM; - -CREATE TABLE INGRESS_ROUTES ( - SEQUENCE INT UNSIGNED NOT NULL, - FEEDID INT UNSIGNED NOT NULL, - USERID VARCHAR(20), - SUBNET VARCHAR(44), - NODESET INT UNSIGNED NOT NULL -); - -CREATE TABLE EGRESS_ROUTES ( - SUBID INT UNSIGNED NOT NULL PRIMARY KEY, - NODEID INT UNSIGNED NOT NULL -); - -CREATE TABLE NETWORK_ROUTES ( - FROMNODE INT UNSIGNED NOT NULL, - TONODE INT UNSIGNED NOT NULL, - VIANODE INT UNSIGNED NOT NULL -); - -CREATE TABLE NODESETS ( - SETID INT UNSIGNED NOT NULL, - NODEID INT UNSIGNED NOT NULL -); - -CREATE TABLE NODES ( - NODEID INT UNSIGNED NOT NULL PRIMARY KEY, - NAME VARCHAR(255) NOT NULL, - ACTIVE BOOLEAN DEFAULT TRUE -); - -CREATE TABLE GROUPS ( - GROUPID INT UNSIGNED NOT NULL PRIMARY KEY, - AUTHID VARCHAR(100) NOT NULL, - NAME VARCHAR(50) NOT NULL, - DESCRIPTION VARCHAR(255), - CLASSIFICATION VARCHAR(20) NOT NULL, - MEMBERS TINYTEXT, - LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP -); - --- 'PROV_AUTH_ADDRESSES', '192.168.56.1' ipv4 address of provision server -INSERT INTO PARAMETERS VALUES - ('ACTIVE_POD', '127.0.0.1'), - ('PROV_ACTIVE_NAME', '${PROV_ACTIVE_NAME}'), - ('STANDBY_POD', '${DRTR_PROV_STANDBYPOD}'), - ('PROV_NAME', 'ALCDTL47TJ6015:6080'), - ('NODES', '127.0.0.1:8080'), - ('PROV_DOMAIN', '127.0.0.1'), - ('DELIVERY_INIT_RETRY_INTERVAL', '10'), - ('DELIVERY_MAX_AGE', '86400'), - ('DELIVERY_MAX_RETRY_INTERVAL', '3600'), - ('DELIVERY_RETRY_RATIO', '2'), - ('LOGROLL_INTERVAL', '300'), - ('PROV_AUTH_ADDRESSES', '192.168.56.1'), - ('PROV_AUTH_SUBJECTS', ''), - ('PROV_MAXFEED_COUNT', '10000'), - ('PROV_MAXSUB_COUNT', '100000'), - ('PROV_REQUIRE_CERT', 'false'), - ('PROV_REQUIRE_SECURE', 'false'), - ('_INT_VALUES', 'LOGROLL_INTERVAL|PROV_MAXFEED_COUNT|PROV_MAXSUB_COUNT|DELIVERY_INIT_RETRY_INTERVAL|DELIVERY_MAX_RETRY_INTERVAL|DELIVERY_RETRY_RATIO|DELIVERY_MAX_AGE') - ;
\ No newline at end of file diff --git a/datarouter-prov/src/main/resources/misc/notes b/datarouter-prov/src/main/resources/misc/notes index e3f872e7..4888dc27 100644 --- a/datarouter-prov/src/main/resources/misc/notes +++ b/datarouter-prov/src/main/resources/misc/notes @@ -71,8 +71,8 @@ DRTR_PROV_TSTOREPASS (default changeit) file is specified. DRTR_PROV_DBLOGIN (default datarouter) - The login used to access MySQL + The login used to access MariaDB DRTR_PROV_DBPASS (default datarouter) - The password used to access MySQL + The password used to access MariaDB DRTR_PROV_DBSCRIPTS (default /opt/app/datartr/etc) The directory containing DB initialization scripts diff --git a/datarouter-prov/src/main/resources/misc/runreports b/datarouter-prov/src/main/resources/misc/runreports index 170d6efb..f6037f4b 100644 --- a/datarouter-prov/src/main/resources/misc/runreports +++ b/datarouter-prov/src/main/resources/misc/runreports @@ -47,7 +47,7 @@ then fi if [ "`pgrep -u mysql mysqld`" = "" ] then - echo MySQL is not running. It must be started before runreports + echo MariaDB is not running. It must be started before runreports exit 1 fi diff --git a/datarouter-prov/src/main/resources/docker-compose/database/install_db.sql b/datarouter-prov/src/main/resources/misc/sql_init_01.sql index 64a07626..e1dfd0c8 100644 --- a/datarouter-prov/src/main/resources/docker-compose/database/install_db.sql +++ b/datarouter-prov/src/main/resources/misc/sql_init_01.sql @@ -1,16 +1,12 @@ -CREATE DATABASE IF NOT EXISTS datarouter; - -CREATE USER 'datarouter'@'%' IDENTIFIED BY 'datarouter'; - -GRANT ALL PRIVILEGES ON * . * TO 'datarouter'@'%'; - use datarouter; CREATE TABLE FEEDS ( FEEDID INT UNSIGNED NOT NULL PRIMARY KEY, - NAME VARCHAR(20) NOT NULL, + GROUPID INT(10) UNSIGNED NOT NULL DEFAULT 0, + NAME VARCHAR(255) NOT NULL, VERSION VARCHAR(20) NOT NULL, - DESCRIPTION VARCHAR(256), + DESCRIPTION VARCHAR(1000), + BUSINESS_DESCRIPTION VARCHAR(1000) DEFAULT NULL, AUTH_CLASS VARCHAR(32) NOT NULL, PUBLISHER VARCHAR(8) NOT NULL, SELF_LINK VARCHAR(256), @@ -18,7 +14,9 @@ CREATE TABLE FEEDS ( SUBSCRIBE_LINK VARCHAR(256), LOG_LINK VARCHAR(256), DELETED BOOLEAN DEFAULT FALSE, - LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP + LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + SUSPENDED BOOLEAN DEFAULT FALSE, + CREATED_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); CREATE TABLE FEED_ENDPOINT_IDS ( @@ -35,6 +33,7 @@ CREATE TABLE FEED_ENDPOINT_ADDRS ( CREATE TABLE SUBSCRIPTIONS ( SUBID INT UNSIGNED NOT NULL PRIMARY KEY, FEEDID INT UNSIGNED NOT NULL, + GROUPID INT(10) UNSIGNED NOT NULL DEFAULT 0, DELIVERY_URL VARCHAR(256), DELIVERY_USER VARCHAR(20), DELIVERY_PASSWORD VARCHAR(32), @@ -43,7 +42,10 @@ CREATE TABLE SUBSCRIPTIONS ( SUBSCRIBER VARCHAR(8) NOT NULL, SELF_LINK VARCHAR(256), LOG_LINK VARCHAR(256), - LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP + LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + SUSPENDED BOOLEAN DEFAULT FALSE, + CREATED_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP + ); CREATE TABLE PARAMETERS ( @@ -52,28 +54,29 @@ CREATE TABLE PARAMETERS ( ); CREATE TABLE LOG_RECORDS ( - TYPE ENUM('pub', 'del', 'exp') NOT NULL, + TYPE ENUM('pub', 'del', 'exp', 'pbf', 'dlx') NOT NULL, EVENT_TIME BIGINT NOT NULL, /* time of the publish request */ PUBLISH_ID VARCHAR(64) NOT NULL, /* unique ID assigned to this publish attempt */ FEEDID INT UNSIGNED NOT NULL, /* pointer to feed in FEEDS */ REQURI VARCHAR(256) NOT NULL, /* request URI */ METHOD ENUM('DELETE', 'GET', 'HEAD', 'OPTIONS', 'PUT', 'POST', 'TRACE') NOT NULL, /* HTTP method */ CONTENT_TYPE VARCHAR(256) NOT NULL, /* content type of published file */ - CONTENT_LENGTH BIGINT UNSIGNED NOT NULL, /* content length of published file */ + CONTENT_LENGTH BIGINT NOT NULL, /* content length of published file */ - FEED_FILEID VARCHAR(128), /* file ID of published file */ - REMOTE_ADDR VARCHAR(40), /* IP address of publishing endpoint */ - USER VARCHAR(20), /* user name of publishing endpoint */ - STATUS SMALLINT, /* status code returned to delivering agent */ + FEED_FILEID VARCHAR(256), /* file ID of published file */ + REMOTE_ADDR VARCHAR(40), /* IP address of publishing endpoint */ + USER VARCHAR(50), /* user name of publishing endpoint */ + STATUS SMALLINT, /* status code returned to delivering agent */ - DELIVERY_SUBID INT UNSIGNED, /* pointer to subscription in SUBSCRIPTIONS */ - DELIVERY_FILEID VARCHAR(128), /* file ID of file being delivered */ - RESULT SMALLINT, /* result received from subscribing agent */ + DELIVERY_SUBID INT UNSIGNED, /* pointer to subscription in SUBSCRIPTIONS */ + DELIVERY_FILEID VARCHAR(256), /* file ID of file being delivered */ + RESULT SMALLINT, /* result received from subscribing agent */ - ATTEMPTS INT, /* deliveries attempted */ - REASON ENUM('notRetryable', 'retriesExhausted'), + ATTEMPTS INT, /* deliveries attempted */ + REASON ENUM('notRetryable', 'retriesExhausted', 'diskFull', 'other'), RECORD_ID BIGINT UNSIGNED NOT NULL PRIMARY KEY, /* unique ID for this record */ + CONTENT_LENGTH_2 BIGINT, INDEX (FEEDID) USING BTREE, INDEX (DELIVERY_SUBID) USING BTREE, @@ -120,24 +123,26 @@ CREATE TABLE GROUPS ( LAST_MOD TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); --- 'PROV_AUTH_ADDRESSES', '192.168.56.1' ipv4 address of provision server INSERT INTO PARAMETERS VALUES - ('ACTIVE_POD', 'prov.datarouternew.com'), - ('PROV_ACTIVE_NAME', 'prov.datarouternew.com'), - ('STANDBY_POD', ''), - ('PROV_NAME', 'prov.datarouternew.com'), - ('NODES', 'node.datarouternew.com'), - ('PROV_DOMAIN', 'datarouternew.com'), - ('DELIVERY_INIT_RETRY_INTERVAL', '10'), - ('DELIVERY_MAX_AGE', '86400'), - ('DELIVERY_MAX_RETRY_INTERVAL', '3600'), - ('DELIVERY_RETRY_RATIO', '2'), - ('LOGROLL_INTERVAL', '300'), - ('PROV_AUTH_ADDRESSES', 'prov.datarouternew.com'), - ('PROV_AUTH_SUBJECTS', ''), - ('PROV_MAXFEED_COUNT', '10000'), - ('PROV_MAXSUB_COUNT', '100000'), - ('PROV_REQUIRE_CERT', 'false'), - ('PROV_REQUIRE_SECURE', 'false'), - ('_INT_VALUES', 'LOGROLL_INTERVAL|PROV_MAXFEED_COUNT|PROV_MAXSUB_COUNT|DELIVERY_INIT_RETRY_INTERVAL|DELIVERY_MAX_RETRY_INTERVAL|DELIVERY_RETRY_RATIO|DELIVERY_MAX_AGE') - ;
\ No newline at end of file + ('ACTIVE_POD', 'prov.datarouternew.com'), + ('PROV_ACTIVE_NAME', 'prov.datarouternew.com'), + ('STANDBY_POD', ''), + ('PROV_NAME', 'prov.datarouternew.com'), + ('NODES', '172.100.0.1|node.datarouternew.com'), + ('PROV_DOMAIN', 'datarouternew.com'), + ('DELIVERY_INIT_RETRY_INTERVAL', '10'), + ('DELIVERY_MAX_AGE', '86400'), + ('DELIVERY_MAX_RETRY_INTERVAL', '3600'), + ('DELIVERY_RETRY_RATIO', '2'), + ('LOGROLL_INTERVAL', '300'), + ('PROV_AUTH_ADDRESSES', '172.100.0.1|prov.datarouternew.com|node.datarouternew.com'), + ('PROV_AUTH_SUBJECTS', ''), + ('PROV_MAXFEED_COUNT', '10000'), + ('PROV_MAXSUB_COUNT', '100000'), + ('PROV_REQUIRE_CERT', 'false'), + ('PROV_REQUIRE_SECURE', 'false'), + ('_INT_VALUES', 'LOGROLL_INTERVAL|PROV_MAXFEED_COUNT|PROV_MAXSUB_COUNT|DELIVERY_INIT_RETRY_INTERVAL|DELIVERY_MAX_RETRY_INTERVAL|DELIVERY_RETRY_RATIO|DELIVERY_MAX_AGE') + ; + +INSERT INTO FEED_ENDPOINT_ADDRS VALUES + (1, '172.100.0.1');
\ No newline at end of file diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties index b722a640..f37330ae 100644 --- a/datarouter-prov/src/main/resources/provserver.properties +++ b/datarouter-prov/src/main/resources/provserver.properties @@ -38,11 +38,11 @@ org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/self org.onap.dmaap.datarouter.provserver.truststore.password = changeit
org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs
org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool
-#org.onap.dmaap.datarouter.provserver.dbscripts = /home/eby/dr2/cvs/datarouter/prov/misc/
+org.onap.dmaap.datarouter.provserver.dbscripts = /opt/app/datartr/etc/misc
org.onap.dmaap.datarouter.provserver.logretention = 30
# Database access
-org.onap.dmaap.datarouter.db.driver = com.mysql.jdbc.Driver
-org.onap.dmaap.datarouter.db.url = jdbc:mysql://172.18.0.2:3306/datarouter
+org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver
+org.onap.dmaap.datarouter.db.url = jdbc:mariadb://172.100.0.2:3306/datarouter
org.onap.dmaap.datarouter.db.login = datarouter
org.onap.dmaap.datarouter.db.password = datarouter
diff --git a/datarouter-prov/src/main/resources/startup.sh b/datarouter-prov/src/main/resources/startup.sh deleted file mode 100644 index e69de29b..00000000 --- a/datarouter-prov/src/main/resources/startup.sh +++ /dev/null |