Merge pull request #1523 from craigcomstock/ENT-12432/master

Added check for psycopg2 python module for nova/tests/reporting

Author: craigcomstock

build-scripts/build-environment-check

@@ -64,6 +64,14 @@ do
     fi
 done
 
+if [ "$PROJECT" = "nova" ]; then
+    . "$BASEDIR"/nova/tests/reporting/find-python.sh # to get PYTHON as the tests do
+    if ! $PYTHON -m pip list | grep psycopg2; then
+        echo "nova/tests/reporting needs psycopg2 module installed for python: $PYTHON"
+        RET=1
+    fi
+fi
+
 
 # Exit with the right exit code
 if [  $RET = 0  ]

ci/cfengine-build-host-setup.cf

@@ -83,9 +83,13 @@ bundle agent cfengine_build_host_setup
       "pkgconfig";
       "perl-IPC-Cmd";
       "perl-devel";
-      "python-psycopg2";
       "xfsprogs";
 
+    (redhat_6|centos_6).(yum_dnf_conf_ok)::
+      "python-psycopg2" comment => "centos-6 provides python2 and psycopg2 for python2 as a package";
+    (redhat_7|centos_7).(yum_dnf_conf_ok)::
+      "python3-psycopg2";
+
 # note that shellcheck, fakeroot and ccache require epel-release to be installed
     (redhat_7|centos_7).(yum_dnf_conf_ok)::
       "epel-release";