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

@@ -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 -}}

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:

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" }}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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 -}}

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:

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":

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 -}}

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:

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 -}}

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:

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}