Merge "Add ansible variables for ingress annotations for roles consuming openstack_helm_ingress role"