diff options
| author |   ITSERVICES\rb7147 <rb7147@att.com> | 2017-05-09 13:54:45 -0400 |
|---|---|---|
| committer | ITSERVICES\rb7147 <rb7147@att.com> | 2017-05-09 15:23:41 -0400 |
| commit | b150ebac50287476676b67a84aff996fc738ee7b (patch) | |
| tree | 67ef0e6e264a243c724300ceee7631d015c6538e /policy-pe | |
| parent | 687f2fc263e76180b85401e60eadd82520504148 (diff) | |
Policy 1707 Docker script changes
Change-Id: I765e2badf48d4f7554de2a6ea037289e3f76e512
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>
Diffstat (limited to 'policy-pe')
| -rw-r--r-- | policy-pe/do-start.sh | 8 | ||||
| -rw-r--r-- | policy-pe/docker-install.sh | 16 |
2 files changed, 7 insertions, 17 deletions
diff --git a/policy-pe/do-start.sh b/policy-pe/do-start.sh index 8bdb8bc9..fc02b860 100644 --- a/policy-pe/do-start.sh +++ b/policy-pe/do-start.sh @@ -14,14 +14,11 @@ pap) 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 @@ 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 ;; |