Fixup make bundle #1857 and add back safeguard from #1867#1875

openshift-merge-bot[bot] merged 1 commit into

openstack-k8s-operators:mainopenstack-k8s-operators/openstack-operator:mainfrom

lmiccini:rmq_make_bundlelmiccini/openstack-operator:rmq_make_bundleCopy head branch name to clipboard