Policy 1707 Docker script changes
Change-Id: I765e2badf48d4f7554de2a6ea037289e3f76e512
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>
diff --git a/policy-pe/do-start.sh b/policy-pe/do-start.sh
index 8bdb8bc..fc02b86 100644
--- a/policy-pe/do-start.sh
+++ b/policy-pe/do-start.sh
@@ -14,14 +14,11 @@
pdp)
comps="base pdp pdplp"
;;
-pypdp)
- comps="base pypdp"
- ;;
brmsgw)
comps="base brmsgw"
;;
*)
- echo "Usage: do-start.sh pap|pdp|pypdp|brmsgw" >&2
+ echo "Usage: do-start.sh pap|pdp|brmsgw" >&2
exit 1
esac
@@ -80,12 +77,11 @@
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 d85e359..140947d 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 @@
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 @@
base)
install_base
;;
- pypdp)
- install_tomcat_component
- ;;
pdp)
install_tomcat_component
;;
@@ -625,7 +622,7 @@
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 @@
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 @@
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
;;