From cdaafde182424c51185909a7fd98924364616fb2 Mon Sep 17 00:00:00 2001 From: Eric Au Date: Thu, 31 Aug 2017 16:18:11 -0400 Subject: Policy 1.1 in Kubernetes - up verion containers to use 1.1 - pap and brmsgw report it is waiting for pap 9091 port to be open but pdp and pypdp reports pap 9091 port is open - removed push-policies.sh from 1.1 due to comment in CR - removed pypdp container from 1.1 due to comment in CR - removed pypdp.conf from 1.1 due to comment in CR - removed ip_addr.txt from 1.1 due to comment in CR Change-Id: Ibb685ec603a59dba56aa9673044ae1923d993191 Issue-Id: OOM-249 Signed-off-by: Eric Au --- .../config/policy/opt/policy/config/pe/brmsgw.conf | 4 +- .../policy/opt/policy/config/pe/console.conf | 2 +- .../config/policy/opt/policy/config/pe/ip_addr.txt | 1 - .../config/policy/opt/policy/config/pe/pap.conf | 4 +- .../config/policy/opt/policy/config/pe/paplp.conf | 2 +- .../config/policy/opt/policy/config/pe/pdp.conf | 4 +- .../config/policy/opt/policy/config/pe/pdplp.conf | 2 +- .../policy/opt/policy/config/pe/push-policies.sh | 75 ---------------------- .../config/policy/opt/policy/config/pe/pypdp.conf | 25 -------- 9 files changed, 9 insertions(+), 110 deletions(-) delete mode 100755 kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/ip_addr.txt delete mode 100755 kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/push-policies.sh delete mode 100755 kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pypdp.conf (limited to 'kubernetes/config/docker/init') diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/brmsgw.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/brmsgw.conf index c69b4f0277..8c70090550 100755 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/brmsgw.conf +++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/brmsgw.conf @@ -4,8 +4,8 @@ BRMSGW_JMX_PORT=9989 COMPONENT_X_MX_MB=1024 COMPONENT_X_MS_MB=1024 -REST_PAP_URL=http://pap:9091/pap/ -REST_PDP_ID=http://pdp:8081/pdp/ +REST_PAP_URL=http://pap.onap-policy:9091/pap/ +REST_PDP_ID=http://pdp.onap-policy:8081/pdp/ PDP_HTTP_USER_ID=testpdp PDP_HTTP_PASSWORD=alpha123 diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf index e53082bb5c..35867eb220 100755 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf +++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/console.conf @@ -85,7 +85,7 @@ REST_PAP_URL=http://pap:9091/pap/ REST_CONFIG_HOME=${{POLICY_HOME}}/servers/pap/webapps/Config/ REST_ACTION_HOME=${{POLICY_HOME}}/servers/pap/webapps/Action/ -REST_CONFIG_URL=http://pap:9091/ +REST_CONFIG_URL=http://pap.onap-policy:9091/ REST_CONFIG_WEBAPPS=${{POLICY_HOME}}/servers/pap/webapps/ # PAP account information diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/ip_addr.txt b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/ip_addr.txt deleted file mode 100755 index 8fde4a8142..0000000000 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/ip_addr.txt +++ /dev/null @@ -1 +0,0 @@ -192.168.141.230 diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pap.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pap.conf index 084f127f52..53c52aaceb 100755 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pap.conf +++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pap.conf @@ -14,7 +14,7 @@ TOMCAT_X_MX_MB=1024 # pap properties PAP_PDPS=${{POLICY_HOME}}/servers/pap/bin/pdps -PAP_URL=http://pap:9091/pap/ +PAP_URL=http://pap.onap-policy:9091/pap/ PAP_INITIATE_PDP=true PAP_HEARTBEAT_INTERVAL=10000 @@ -26,7 +26,7 @@ REST_ADMIN_WORKSPACE=workspace # PDP related properties -PAP_PDP_URL=http://pdp:8081/pdp/ +PAP_PDP_URL=http://pdp.onap-policy:8081/pdp/ PAP_PDP_HTTP_USER_ID=testpdp PAP_PDP_HTTP_PASSWORD=alpha123 diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/paplp.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/paplp.conf index 9fdd643bc3..d25f11be3b 100755 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/paplp.conf +++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/paplp.conf @@ -3,7 +3,7 @@ LOGPARSER_JMX_PORT=9996 LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 -SERVER=http://pap:9091/pap/ +SERVER=http://pap.onap-policy:9091/pap/ LOGPATH=${{POLICY_HOME}}/servers/pap/logs/pap-rest.log PARSERLOGPATH=IntegrityMonitor.log diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdp.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdp.conf index 8f64457b2c..9d56d49f96 100755 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdp.conf +++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdp.conf @@ -15,8 +15,8 @@ TOMCAT_X_MX_MB=1024 UEB_CLUSTER=dmaap.onap-message-router -REST_PAP_URL=http://pap:9091/pap/ -REST_PDP_ID=http://pdp:8081/pdp/ +REST_PAP_URL=http://pap.onap-policy:9091/pap/ +REST_PDP_ID=http://pdp.onap-policy:8081/pdp/ REST_PDP_CONFIG=${{POLICY_HOME}}/servers/pdp/bin/config REST_PDP_WEBAPPS=${{POLICY_HOME}}/servers/pdp/webapps REST_PDP_REGISTER=true diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdplp.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdplp.conf index 789d2b01f1..8320caa56b 100755 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdplp.conf +++ b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pdplp.conf @@ -3,7 +3,7 @@ LOGPARSER_JMX_PORT=9997 LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 -SERVER=http://pdp:8081/pdp/ +SERVER=http://pdp.onap-policy:8081/pdp/ LOGPATH=${{POLICY_HOME}}/servers/pdp/logs/pdp-rest.log PARSERLOGPATH=IntegrityMonitor.log diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/push-policies.sh b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/push-policies.sh deleted file mode 100755 index 957156edb8..0000000000 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/push-policies.sh +++ /dev/null @@ -1,75 +0,0 @@ -#! /bin/bash - - -echo "Pushing default policies" - -# Sometimes brmsgw gets an error when trying to retrieve the policies on initial push, -# so for the BRMS policies we will do a push, then delete from the pdp group, then push again. -# Second push should be successful. - -curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ - "pdpGroup": "default", - "policyName": "vFirewall", - "policyScope": "com", - "policyType": "MicroService" -}' 'http://pypdp:8480/PyPDPServer/pushPolicy' - -sleep 2 - -curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ - "pdpGroup": "default", - "policyName": "vLoadBalancer", - "policyScope": "com", - "policyType": "MicroService" -}' 'http://pypdp:8480/PyPDPServer/pushPolicy' - -sleep 2 -curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ - "pdpGroup": "default", - "policyName": "BRMSParamvLBDemoPolicy", - "policyScope": "com", - "policyType": "BRMS_Param" -}' 'http://pypdp:8480/PyPDPServer/pushPolicy' - -sleep 2 - -curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ - "pdpGroup": "default", - "policyName": "BRMSParamvFWDemoPolicy", - "policyScope": "com", - "policyType": "BRMS_Param" -}' 'http://pypdp:8480/PyPDPServer/pushPolicy' - -sleep 2 - -curl -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ -"pdpGroup": "default", -"policyComponent": "PDP", -"policyName": "com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml" -}' 'http://pypdp:8480/PyPDPServer/deletePolicy' - - - -curl -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ -"pdpGroup": "default", -"policyComponent": "PDP", -"policyName": "com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml" -}' 'http://pypdp:8480/PyPDPServer/deletePolicy' - -sleep 2 -curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ - "pdpGroup": "default", - "policyName": "BRMSParamvLBDemoPolicy", - "policyScope": "com", - "policyType": "BRMS_Param" -}' 'http://pypdp:8480/PyPDPServer/pushPolicy' - -sleep 2 - -curl -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHJlc3Q6M2MwbXBVI2gwMUBOMWMz' --header 'Environment: TEST' -d '{ - "pdpGroup": "default", - "policyName": "BRMSParamvFWDemoPolicy", - "policyScope": "com", - "policyType": "BRMS_Param" -}' 'http://pypdp:8480/PyPDPServer/pushPolicy' - diff --git a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pypdp.conf b/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pypdp.conf deleted file mode 100755 index 4a792b47a9..0000000000 --- a/kubernetes/config/docker/init/src/config/policy/opt/policy/config/pe/pypdp.conf +++ /dev/null @@ -1,25 +0,0 @@ -# pypdp component installation configuration parameters - -# tomcat specific parameters - -TOMCAT_JMX_PORT=9994 -TOMCAT_SHUTDOWN_PORT=8405 -SSL_HTTP_CONNECTOR_PORT=8480 -SSL_AJP_CONNECTOR_PORT=8384 -SSL_AJP_CONNECTOR_REDIRECT_PORT=8443 - -TOMCAT_X_MS_MB=1024 -TOMCAT_X_MX_MB=1024 - -# pypdp parameters - -PDP_URL=http://pdp:8081/pdp/,testpdp,alpha123 -PAP_URL=http://pap:9091/pap/,testpap,alpha123 -PYPDP_ID=testrest -PYPDP_PASSWORD=3c0mpU#h01@N1c3 - -node_type=pypdp -# the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase -resource_name=pypdp_1 - -CLIENT_FILE=client.properties -- cgit 1.2.3-korg