Small revisions based on feedback

- Removed unnecessary sleep timers
- Added 'OPENSHIFT_{var_name}_VERIFY' switch for tls verification
- Pinned openshift-acct-mgt to current version

ci/microshift.sh

@@ -3,6 +3,8 @@
 #
 set -xe
 
+export ACCT_MGT_VERSION="e955158dc9fbd2a7aa68a8818fb7018315141d2b"
+
 sudo apt-get update && sudo apt-get upgrade -y
 
 if [[ ! "${CI}" == "true" ]]; then
@@ -18,18 +20,21 @@ sudo docker run -d --rm --name microshift --privileged \
 
 sudo docker run -d --name registry --network host registry:2
 
-sleep 30
-
 curl -O "https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz"
 sudo tar -xf openshift-client-linux.tar.gz -C /usr/local/bin oc kubectl
 
 mkdir ~/.kube
 sudo docker cp microshift:/var/lib/microshift/resources/kubeadmin/kubeconfig ~/.kube/config
-oc get all
+
+while ! oc get all -h; do
+    echo "Waiting on Microshift"
+    sleep 5
+done
 
 # Install OpenShift Account Management
 git clone https://github.com/cci-moc/openshift-acct-mgt.git ~/openshift-acct-mgt
 cd ~/openshift-acct-mgt
+git checkout "$ACCT_MGT_VERSION"
 sudo docker build . -t "localhost:5000/cci-moc/openshift-acct-mgt:latest"
 sudo docker push "localhost:5000/cci-moc/openshift-acct-mgt:latest"
 

src/coldfront_plugin_openstack/openshift.py

@@ -31,8 +31,12 @@ def session(self):
         session = requests.session()
         if username and password:
             session.auth = HTTPBasicAuth(username, password)
-        if os.environ.get('FUNCTIONAL_TESTS', '') == 'True':
+
+        functional_tests = os.environ.get('FUNCTIONAL_TESTS', '').lower()
+        verify = os.getenv(f'OPENSHIFT_{var_name}_VERIFY', '').lower()
+        if functional_tests == 'true' or verify == 'false':
             session.verify = False
+
         return session
 
     @staticmethod