From: ITSERVICES\rb7147 Date: Tue, 9 May 2017 17:54:45 +0000 (-0400) Subject: Policy 1707 Docker script changes X-Git-Tag: v1.1.0~64^2~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b150ebac50287476676b67a84aff996fc738ee7b;p=policy%2Fdocker.git Policy 1707 Docker script changes Change-Id: I765e2badf48d4f7554de2a6ea037289e3f76e512 Signed-off-by: ITSERVICES\rb7147 --- diff --git a/config/pe/base.conf b/config/pe/base.conf index e798a40d..fc1718fb 100644 --- a/config/pe/base.conf +++ b/config/pe/base.conf @@ -1,6 +1,8 @@ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 POLICY_HOME=/opt/app/policy KEYSTORE_PASSWD=PolicyR0ck$ +KEY_PASSWD=PolicyR0ck$ +TRUSTSTORE_PASSWD=PolicyR0ck$ JDBC_DRIVER=org.mariadb.jdbc.Driver JDBC_URL=jdbc:mariadb://mariadb:3306/ecomp_sdk @@ -18,3 +20,7 @@ test_via_jmx=false jmx_fqdn= ENVIRONMENT=TEST + +#Micro Service Model Properties +policy_msEcompName= +policy_msPolicyName= \ No newline at end of file diff --git a/config/pe/brmsgw.conf b/config/pe/brmsgw.conf index da2cd0a4..f9188478 100644 --- a/config/pe/brmsgw.conf +++ b/config/pe/brmsgw.conf @@ -41,3 +41,14 @@ node_type=brms_gateway CLIENT_ID=PyPDPServer CLIENT_KEY=test ENVIRONMENT=TEST + +#Notification Properties... type can be either websocket, ueb, or dmaap +BRMS_NOTIFICATION_TYPE=websocket +BRMS_UEB_URL= +BRMS_UEB_TOPIC= +BRMS_UEB_DELAY= +BRMS_CLIENT_ID= +BRMS_CLIENT_KEY= +BRMS_UEB_API_KEY= +BRMS_UEB_API_SECRET= + diff --git a/config/pe/console.conf b/config/pe/console.conf index 6606addb..85233072 100644 --- a/config/pe/console.conf +++ b/config/pe/console.conf @@ -116,6 +116,7 @@ ecomp_smtp_host= ecomp_smtp_port=25 ecomp_smtp_userName= ecomp_smtp_password= +ecomp_smtp_emailExtension= ecomp_application_name= #-----------------------ECOMP-PORTAL-Properties---------------------- @@ -129,7 +130,3 @@ ECOMP_UEB_APP_SECRET= ECOMP_UEB_APP_MAILBOX_NAME= APP_DISPLAY_NAME=OpenECOMP Policy ECOMP_SHARED_CONTEXT_REST_URL=http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context - -#Add the Rest PAP url and pap auth password on adding delimiter @Auth@ - -REST_PAPURL_WITH_AUTH_PASSWORD=http://policy.api.simpledemo.openecomp.org:9091/pap/@Auth@dGVzdHBhcDphbHBoYTEyMw== diff --git a/config/pe/pap-tweaks.sh b/config/pe/pap-tweaks.sh index be8a905a..36ac3689 100755 --- a/config/pe/pap-tweaks.sh +++ b/config/pe/pap-tweaks.sh @@ -1,15 +1 @@ #! /bin/bash - -# config directory may contain an ip_addr.txt file that specifies -# the VM IP address. Substitute this value in the URL in the -# config.json file, overriding the hostname that came from the -# REST_PAPURL_WITH_AUTH_PASSWORD property in console.conf. This is -# to avoid hardcoding an IP address in console.conf that can change -# from one VM instance to the next. - -if [[ -f config/ip_addr.txt ]]; then - vm_ip=$(&2 + echo "Usage: do-start.sh pap|pdp|brmsgw" >&2 exit 1 esac @@ -80,12 +77,11 @@ fi policy.sh start -# on pap, wait for pap, pdp, pypdp, brmsgw, and nexus up, +# on pap, wait for pap, pdp, brmsgw, and nexus up, # then push the initial default policies if [[ $container == pap ]]; then ./wait-for-port.sh pap 9091 ./wait-for-port.sh pdp 8081 - ./wait-for-port.sh pypdp 8480 # brmsgw doesn't have a REST API, so check for JMX port instead ./wait-for-port.sh brmsgw 9989 ./wait-for-port.sh nexus 8081 diff --git a/policy-pe/docker-install.sh b/policy-pe/docker-install.sh index d85e3592..140947da 100644 --- a/policy-pe/docker-install.sh +++ b/policy-pe/docker-install.sh @@ -9,8 +9,8 @@ function usage() { echo -n "syntax: $(basename $0) " echo -n "--debug (" - echo -n "[--install base|pap|pdp|pypdp|console|mysql|brmsgw|paplp|pdplp] | " - echo -n "[--configure base|pap|pdp|pypdp|console|mysql|brmsgw|paplp|pdplp] | " + echo -n "[--install base|pap|pdp|console|mysql|brmsgw|paplp|pdplp] | " + echo -n "[--configure base|pap|pdp|console|mysql|brmsgw|paplp|pdplp] | " } function check_java() { @@ -550,7 +550,7 @@ case $COMPONENT_TYPE in paplp) ;; pdplp) ;; skip) ;; - *) echo "invalid component type (${COMPONENT_TYPE}): must be in {base|pypdp|pdp|pap|console|mysql|brmsgw|paplp|pdplp}"; + *) echo "invalid component type (${COMPONENT_TYPE}): must be in {base|pdp|pap|console|mysql|brmsgw|paplp|pdplp}"; usage exit 1 ;; @@ -603,9 +603,6 @@ if [[ ${OPERATION} == install ]]; then base) install_base ;; - pypdp) - install_tomcat_component - ;; pdp) install_tomcat_component ;; @@ -625,7 +622,7 @@ if [[ ${OPERATION} == install ]]; then install_logparser ;; *) - echo "invalid component type (${COMPONENT_TYPE}): must be in {base|pypdp|pdp|pap|console|mysql|brmsgw|paplp|pdplp}"; + echo "invalid component type (${COMPONENT_TYPE}): must be in {base|pdp|pap|console|mysql|brmsgw|paplp|pdplp}"; usage exit 1 ;; @@ -640,9 +637,6 @@ if [[ ${OPERATION} == configure ]]; then configure_base component_preconfigure ;; - pypdp) - configure_component "${COMPONENT_TYPE}.conf" "${POLICY_HOME}/servers/${COMPONENT_TYPE}/" - ;; pdp) configure_component "${COMPONENT_TYPE}.conf" "${POLICY_HOME}/servers/${COMPONENT_TYPE}/" ;; @@ -662,7 +656,7 @@ if [[ ${OPERATION} == configure ]]; then configure_component "${COMPONENT_TYPE}.conf" "${POLICY_HOME}/servers/${COMPONENT_TYPE}/" ;; *) - echo "invalid component type (${COMPONENT_TYPE}): must be in {base|pypdp|pdp|pap|console|mysql|brmsgw|paplp|pdplp}"; + echo "invalid component type (${COMPONENT_TYPE}): must be in {base|pdp|pap|console|mysql|brmsgw|paplp|pdplp}"; usage exit 1 ;;