diff options
Diffstat (limited to 'pgaas-post/src')
| -rw-r--r-- | pgaas-post/src/makefile | 8 | ||||
| -rw-r--r-- | pgaas-post/src/repackage.json | 32 | ||||
| -rw-r--r-- | pgaas-post/src/stage/opt/app/pgaas-post/bin/pgaas-verify-install | 25 |
3 files changed, 33 insertions, 32 deletions
diff --git a/pgaas-post/src/makefile b/pgaas-post/src/makefile index 07c260d..222fcb3 100644 --- a/pgaas-post/src/makefile +++ b/pgaas-post/src/makefile @@ -28,13 +28,9 @@ stage: clean-stage clean-common cp -p repackage.* $(INS) -debian-verify: stage - repackage -b debian $(REPACKAGEDEBIANOPTS) -d $(INS) - @echo debian verify built - debian: stage - repackage -y repackage.json -b debian -d $(INS) -u - # repackage -y repackage.json -b debian -d $(INS) -u -B LATEST + repackage -b debian -d $(INS) -u + repackage -b debian -d $(INS) -u -B LATEST @echo debian built upload-javadocs: diff --git a/pgaas-post/src/repackage.json b/pgaas-post/src/repackage.json index 43c35c9..2cdce5c 100644 --- a/pgaas-post/src/repackage.json +++ b/pgaas-post/src/repackage.json @@ -1,23 +1,23 @@ { - "version": "1.1.0", - "executionUser": "root", - "description": " PostgreSQL as a Service main scripts ", - "maintainer": "OpenECOMP <dcae@lists.openecomp.org>", + "applicationName": "pgaas-post", "debian": { - "replaces": [], - "groupId": "org.openecomp.dcae.storage.pgaas", + "conflicts": [], "externalDependencies": [], - "conflicts": [] + "groupId": "org.openecomp.dcae.storage.pgaas", + "replaces": [] }, - "internalDependencies": [], - "fileUser": "root", + "description": " PostgreSQL as a Service main scripts ", + "directoryTreeTops": {}, "docker": { - "tag": "latest", - "externalDependencies": [] + "externalDependencies": [], + "tag": "latest" }, - "directoryTreeTops": {}, - "groupId": "org.openecomp.dcae.storage.pgaas", + "executionGroup": "root", + "executionUser": "root", "fileGroup": "root", - "applicationName": "pgaas-post", - "executionGroup": "root" -} + "fileUser": "root", + "groupId": "org.openecomp.dcae.storage.pgaas", + "internalDependencies": [], + "maintainer": "OpenECOMP <dcae@lists.openecomp.org>", + "version": "1.1.0" +}
\ No newline at end of file diff --git a/pgaas-post/src/stage/opt/app/pgaas-post/bin/pgaas-verify-install b/pgaas-post/src/stage/opt/app/pgaas-post/bin/pgaas-verify-install index 5bf3962..6e440a4 100644 --- a/pgaas-post/src/stage/opt/app/pgaas-post/bin/pgaas-verify-install +++ b/pgaas-post/src/stage/opt/app/pgaas-post/bin/pgaas-verify-install @@ -28,9 +28,10 @@ usage() b=$(basename $0) echo "Usage: $b [-v]" echo "$b runs a variety of tests on the PG VM and database" - echo "It must be run as root or postgres." + echo "It should be run as root or postgres." echo "If run as root, it will do additional tests that are" - echo "not possible as a normal user." + echo "not possible as a normal user. If not run as root or" + echo "postgres, other tests may fail." echo " -v verbose" echo " -P do not print VERIFIED" exit 1 @@ -52,7 +53,7 @@ ROOT=false case `id` in *"(root)"* ) ROOT=true ;; *"(postgres)"* ) ;; - * ) echo "$0 must be run as either root or postgres" ;; + * ) echo "$0 should be run as either root or postgres" ;; esac VERIFIEDCOUNT=0 @@ -154,7 +155,16 @@ if [ -s /lib/systemd/system/pgaas-idns.service ] then verified "found pgaas-idns service properly installed for Ubuntu 16" elif [ -s /etc/init/pgaas-init.conf ] then verified "found pgaas-idns service properly installed for Ubuntu 14" -else failed "pgaas-idns service has not bee installed properly" +else failed "pgaas-idns service has not been installed properly" +fi + +if ps -ef | grep '[i]DNS-responder' > /dev/null +then verified "iDNS-responder is running" + if ps -fu postgres | grep '[i]DNS-responder' > /dev/null + then verified "iDNS-responder is running as postgres" + else failed "iDNS-responder is running, but not as postgres" + fi +else failed "postgres does not have a logger process running" fi if [ -d /var/run/postgresql ] @@ -173,7 +183,7 @@ fi ################ postgresql-config ################ ################################################################ -if ps -fu postgres | grep "postgres: logger process" > /dev/null +if ps -fu postgres | grep "[p]ostgres: logger process" > /dev/null then verified "postgres is running" else failed "postgres does not have a logger process running" fi @@ -205,11 +215,6 @@ else failed "/opt/app/pgaas/bin/runpsqll is not installed" fi -if ps -ef | grep python3 | grep iDNS-responder.py > /dev/null -then verified "iDNS-responder.py is running" -else failed "iDNS-responder.py is not running" -fi - if [ -f /opt/app/pgaas/bin/check_cluster ] then verified "/opt/app/pgaas/bin/check_cluster is installed" |