[QUEENS] Added opportunity switch to standalone Rabbitmq mode for services

Change-Id: Ib393fe1a43573b45674b996b04727939da13a5af
Related-Prod: PROD-32458
diff --git a/oslo_templates/files/queens/oslo/messaging/_default.conf b/oslo_templates/files/queens/oslo/messaging/_default.conf
index 8696cf9..3161136 100644
--- a/oslo_templates/files/queens/oslo/messaging/_default.conf
+++ b/oslo_templates/files/queens/oslo/messaging/_default.conf
@@ -225,7 +225,7 @@
 # (string value)
 #transport_url = <None>
 {%- set rabbit_port = _data.get('port', 5671 if _data.get('ssl',{}).get('enabled', False)  else 5672) %}
-{%- if _data.members is defined %}
+{%- if _data.members is defined and not _data.get('use_vip_address', False) %}
 transport_url = rabbit://{% for member in _data.members -%}
                              {{ _data.user }}:{{ _data.password }}@{{ member.host }}:{{ member.get('port', rabbit_port) }}
                              {%- if not loop.last -%},{%- endif -%}
diff --git a/tests/pillar/queens/oslo/messaging/_default.sls b/tests/pillar/queens/oslo/messaging/_default.sls
index 78db5b3..2da40c9 100644
--- a/tests/pillar/queens/oslo/messaging/_default.sls
+++ b/tests/pillar/queens/oslo/messaging/_default.sls
@@ -2,6 +2,7 @@
   user: user
   password: password
   virtual_host: /
+  host: 127.0.0.1
   members:
     - host: srv1
       port: 5671