From 9bcf0df94c1a8455e17aa79f20efaf2736eed0f4 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Mon, 17 Jun 2019 08:56:59 -0500
Subject: [PATCH] Messaging: use htk function to directly hit RabbitMQ servers

This PS updates the charts to use the htk function recently introduced
to allow oslo.messaging clients ans servers to directly hit their
backends rather than using either DNS or K8S svc based routing.

Depends-On: I5150a64bd29fa062e30496c1f2127de138322863

Change-Id: I458b4313c57fc50c8181cedeca9919670487926a
Signed-off-by: Pete Birley <pete@port.direct>
---
 aodh/templates/configmap-etc.yaml                 | 2 +-
 aodh/values.yaml                                  | 3 +++
 barbican/templates/configmap-etc.yaml             | 2 +-
 barbican/values.yaml                              | 3 +++
 ceilometer/templates/configmap-etc.yaml           | 6 +++---
 ceilometer/values.yaml                            | 3 +++
 cinder/templates/configmap-etc.yaml               | 2 +-
 cinder/values.yaml                                | 3 +++
 congress/templates/configmap-etc.yaml             | 2 +-
 congress/values.yaml                              | 3 +++
 glance/templates/configmap-etc.yaml               | 4 ++--
 glance/values.yaml                                | 3 +++
 heat/templates/configmap-etc.yaml                 | 2 +-
 heat/values.yaml                                  | 3 +++
 ironic/templates/configmap-etc.yaml               | 2 +-
 ironic/values.yaml                                | 3 +++
 keystone/templates/configmap-etc.yaml             | 2 +-
 keystone/values.yaml                              | 3 +++
 magnum/templates/configmap-etc.yaml               | 2 +-
 magnum/values.yaml                                | 3 +++
 mistral/templates/configmap-etc.yaml              | 2 +-
 mistral/values.yaml                               | 3 +++
 neutron/templates/configmap-etc.yaml              | 2 +-
 neutron/values.yaml                               | 3 +++
 nova/templates/bin/_health-probe.py.tpl           | 2 +-
 nova/templates/configmap-etc.yaml                 | 2 +-
 nova/values.yaml                                  | 3 +++
 senlin/templates/configmap-etc.yaml               | 2 +-
 senlin/values.yaml                                | 3 +++
 tools/deployment/developer/common/060-rabbitmq.sh | 1 -
 30 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/aodh/templates/configmap-etc.yaml b/aodh/templates/configmap-etc.yaml
index 7cd0dcb18f..3a1cd40d8d 100644
--- a/aodh/templates/configmap-etc.yaml
+++ b/aodh/templates/configmap-etc.yaml
@@ -62,7 +62,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.aodh.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "aodh" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.aodh.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "aodh" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.aodh.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.aodh.service_credentials.auth_url -}}
diff --git a/aodh/values.yaml b/aodh/values.yaml
index 381e45694d..720cdbbde4 100644
--- a/aodh/values.yaml
+++ b/aodh/values.yaml
@@ -652,6 +652,9 @@ endpoints:
       aodh:
         username: aodh
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml
index 18d5d37ca3..0e640876a5 100644
--- a/barbican/templates/configmap-etc.yaml
+++ b/barbican/templates/configmap-etc.yaml
@@ -56,7 +56,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.barbican.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "barbican" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.barbican.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "barbican" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.barbican.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- $barbicanPath := index .Values "endpoints" "key_manager" "path" "default" }}
diff --git a/barbican/values.yaml b/barbican/values.yaml
index 3eb02d90d7..e97e72a12a 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -630,6 +630,9 @@ endpoints:
       barbican:
         username: barbican
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml
index ec64d69fac..695908495e 100644
--- a/ceilometer/templates/configmap-etc.yaml
+++ b/ceilometer/templates/configmap-etc.yaml
@@ -49,15 +49,15 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.ceilometer.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.ceilometer.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.ceilometer.oslo_messaging_notifications.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.oslo_messaging_notifications "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.ceilometer.oslo_messaging_notifications "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.ceilometer.notification.messaging_urls -}}
-{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.notification "messaging_urls" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.ceilometer.notification "messaging_urls" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.ceilometer.keystone_authtoken.region_name -}}
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 64a80ab112..44dda74d8e 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -1899,6 +1899,9 @@ endpoints:
       ceilometer:
         username: ceilometer
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml
index 16cde920ed..f934b92ecb 100644
--- a/cinder/templates/configmap-etc.yaml
+++ b/cinder/templates/configmap-etc.yaml
@@ -56,7 +56,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.cinder.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "cinder" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.cinder.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "cinder" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.cinder.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.cinder.DEFAULT.glance_api_servers -}}
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 6d36a173f7..93a23c4523 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -1312,6 +1312,9 @@ endpoints:
       cinder:
         username: cinder
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/congress/templates/configmap-etc.yaml b/congress/templates/configmap-etc.yaml
index 4b4fd0536e..4c671beab7 100644
--- a/congress/templates/configmap-etc.yaml
+++ b/congress/templates/configmap-etc.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- $envAll := . }}
 
 {{- if empty .Values.conf.congress.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "congress" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.congress.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "congress" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.congress.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.congress.database.connection -}}
diff --git a/congress/values.yaml b/congress/values.yaml
index 9a3908ec4f..d70f569469 100644
--- a/congress/values.yaml
+++ b/congress/values.yaml
@@ -306,6 +306,9 @@ endpoints:
       congress:
         username: congress
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml
index 28d3b93186..c2729c7d59 100644
--- a/glance/templates/configmap-etc.yaml
+++ b/glance/templates/configmap-etc.yaml
@@ -90,10 +90,10 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.glance.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "transport_url" -}}
 {{- end -}}
 {{- if empty .Values.conf.glance_registry.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance_registry.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.glance_registry.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.glance.DEFAULT.registry_host -}}
diff --git a/glance/values.yaml b/glance/values.yaml
index df8ff14d59..30f11184b8 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -727,6 +727,9 @@ endpoints:
       glance:
         username: glance
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml
index 926a0daefc..115ea9ae28 100644
--- a/heat/templates/configmap-etc.yaml
+++ b/heat/templates/configmap-etc.yaml
@@ -79,7 +79,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.heat.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "heat" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.heat.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "heat" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.heat.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.heat.DEFAULT.heat_metadata_server_url -}}
diff --git a/heat/values.yaml b/heat/values.yaml
index 4fbf24a3d2..189b7da107 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -965,6 +965,9 @@ endpoints:
       heat:
         username: heat
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/ironic/templates/configmap-etc.yaml b/ironic/templates/configmap-etc.yaml
index bf92433ff2..c7268c4edf 100644
--- a/ironic/templates/configmap-etc.yaml
+++ b/ironic/templates/configmap-etc.yaml
@@ -54,7 +54,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.ironic.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "ironic" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ironic.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "ironic" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.ironic.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.ironic.glance.glance_host -}}
diff --git a/ironic/values.yaml b/ironic/values.yaml
index 3af3b434ac..d9c4d840ef 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -497,6 +497,9 @@ endpoints:
       ironic:
         username: ironic
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/keystone/templates/configmap-etc.yaml b/keystone/templates/configmap-etc.yaml
index 25605f04ab..a8c0004e4c 100644
--- a/keystone/templates/configmap-etc.yaml
+++ b/keystone/templates/configmap-etc.yaml
@@ -22,7 +22,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.keystone.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "keystone" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "keystone" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.keystone.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.keystone.cache.memcache_servers -}}
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 6543828de8..4809c56f86 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -1206,6 +1206,9 @@ endpoints:
       keystone:
         username: keystone
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/magnum/templates/configmap-etc.yaml b/magnum/templates/configmap-etc.yaml
index 7796fa0c27..ead495fe06 100644
--- a/magnum/templates/configmap-etc.yaml
+++ b/magnum/templates/configmap-etc.yaml
@@ -56,7 +56,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.magnum.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "magnum" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.magnum.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "magnum" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.magnum.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.magnum.api.port -}}
diff --git a/magnum/values.yaml b/magnum/values.yaml
index e4928cb1e8..8031e31ee0 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -451,6 +451,9 @@ endpoints:
       magnum:
         username: magnum
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml
index 2e24c764ce..bd085aef24 100644
--- a/mistral/templates/configmap-etc.yaml
+++ b/mistral/templates/configmap-etc.yaml
@@ -56,7 +56,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.mistral.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "mistral" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.mistral.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "mistral" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.mistral.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.mistral.api.port -}}
diff --git a/mistral/values.yaml b/mistral/values.yaml
index c0df7dc07d..a12c2af2ea 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -288,6 +288,9 @@ endpoints:
       mistral:
         username: mistral
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index b975c0299f..016b6ea24e 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -58,7 +58,7 @@ limitations under the License.
 {{- end }}
 
 {{- if empty $envAll.Values.conf.neutron.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "neutron" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set $envAll.Values.conf.neutron.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "neutron" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set $envAll.Values.conf.neutron.DEFAULT "transport_url" -}}
 {{- end }}
 
 {{- if empty $envAll.Values.conf.neutron.nova.auth_url -}}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 761ae2e69b..efe4e26ac6 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1761,6 +1761,9 @@ endpoints:
       neutron:
         username: neutron
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/nova/templates/bin/_health-probe.py.tpl b/nova/templates/bin/_health-probe.py.tpl
index 4c1aa453f5..8d992cfad7 100644
--- a/nova/templates/bin/_health-probe.py.tpl
+++ b/nova/templates/bin/_health-probe.py.tpl
@@ -125,7 +125,7 @@ def configured_port_in_conf():
         with open(sys.argv[2]) as conf_file:
             for line in conf_file:
                 if "transport_url" in line:
-                    rabbitmq_port = int(line.split(':', 3)[3].split('/')[0])
+                    rabbitmq_port = int(line.split(':', 3)[3].split(',')[0].split('/')[0])
                 elif "connection =" in line:
                     service = line.split(':', 3)[3].split('/')[1].rstrip('\n')
                     if service == "nova":
diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml
index bfab44078a..eed9494f83 100644
--- a/nova/templates/configmap-etc.yaml
+++ b/nova/templates/configmap-etc.yaml
@@ -65,7 +65,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.nova.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "nova" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "nova" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.nova.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.nova.glance.api_servers -}}
diff --git a/nova/values.yaml b/nova/values.yaml
index a08e6c630a..815541db8a 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1865,6 +1865,9 @@ endpoints:
       nova:
         username: nova
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/senlin/templates/configmap-etc.yaml b/senlin/templates/configmap-etc.yaml
index 027b4689c4..da78fbc64e 100644
--- a/senlin/templates/configmap-etc.yaml
+++ b/senlin/templates/configmap-etc.yaml
@@ -57,7 +57,7 @@ limitations under the License.
 {{- end -}}
 
 {{- if empty .Values.conf.senlin.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "senlin" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.senlin.DEFAULT "transport_url" -}}
+{{- $_ := tuple "oslo_messaging" "internal" "senlin" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.senlin.DEFAULT "transport_url" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.senlin.senlin_api.bind_port -}}
diff --git a/senlin/values.yaml b/senlin/values.yaml
index 3d27e82d58..586e5d68ae 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -470,6 +470,9 @@ endpoints:
       senlin:
         username: senlin
         password: password
+    statefulset:
+      replicas: 2
+      name: rabbitmq-rabbitmq
     hosts:
       default: rabbitmq
     host_fqdn_override:
diff --git a/tools/deployment/developer/common/060-rabbitmq.sh b/tools/deployment/developer/common/060-rabbitmq.sh
index 605cb91926..82e2aa6979 100755
--- a/tools/deployment/developer/common/060-rabbitmq.sh
+++ b/tools/deployment/developer/common/060-rabbitmq.sh
@@ -24,7 +24,6 @@ make -C ${OSH_INFRA_PATH} rabbitmq
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \
     --namespace=openstack \
-    --set pod.replicas.server=1 \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}