Merge pull request #895 from openshift-cherrypick-robot/cherry-pick-8… · openstack-k8s-operators/osp-director-operator@02d1a84