More work on integrating openshift.