Merge pull request #860 from openshift-cherrypick-robot/cherry-pick-8… · openstack-k8s-operators/edpm-ansible@db14feb