From 91af246bdfd5e0245cebe065495d3aaea7046b28 Mon Sep 17 00:00:00 2001
From: Andrew Smith <ansmith@redhat.com>
Date: Mon, 11 Jun 2018 13:30:59 -0400
Subject: [PATCH] Update to use oslo.messaging service for Notify

This introduces oslo.messaging variables that define the Notify transport
in place of the rabbitmq values.

This patch:
* Add oslo.messaging variable for Notify to defaults
* Update url generation
* Add oslo.messaging to inventory
* Add release note

Change-Id: I1c2e844c4c7a2256087bcc4521f970ca8e8c6b16
---
 defaults/main.yml                                | 16 +++++++++-------
 ...aging-separate-backends-e82ea3162d2d383f.yaml | 15 +++++++++++++++
 templates/proxy-server.conf.j2                   |  2 +-
 tests/inventory                                  |  3 +++
 4 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/oslo-messaging-separate-backends-e82ea3162d2d383f.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index 84bc4c2b..f3d528bb 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -194,13 +194,15 @@ swift_force_change_hashes: False
 ## Swift ceilometer variables
 swift_reselleradmin_role: ResellerAdmin
 
-# Swift ceilometer rabbitmq settings
-swift_rabbitmq_telemetry_userid: "swift"
-swift_rabbitmq_telemetry_vhost: "/swift"
-swift_rabbitmq_telemetry_port: "5672"
-swift_rabbitmq_telemetry_servers: "127.0.0.1"
-# For now swift ceilometer does not work with SSL - this is a speculative option in the hope it gets added
-swift_rabbitmq_telemetry_use_ssl: "False"
+## Oslo Messaging
+
+# Notify
+swift_oslomsg_notify_transport: rabbit
+swift_oslomsg_notify_servers: 127.0.0.1
+swift_oslomsg_notify_port: 5672
+swift_oslomsg_notify_use_ssl: False
+swift_oslomsg_notify_userid: swift
+swift_oslomsg_notify_vhost: /swift
 
 ## General Swift configuration
 # We are not capping the default value for these swift variables which define
diff --git a/releasenotes/notes/oslo-messaging-separate-backends-e82ea3162d2d383f.yaml b/releasenotes/notes/oslo-messaging-separate-backends-e82ea3162d2d383f.yaml
new file mode 100644
index 00000000..ed00f66b
--- /dev/null
+++ b/releasenotes/notes/oslo-messaging-separate-backends-e82ea3162d2d383f.yaml
@@ -0,0 +1,15 @@
+---
+features:
+  - Support separate oslo.messaging services for RPC and Notifications
+    to enable operation of separate and different messaging backend servers.
+deprecations:
+  - |
+    The rabbitmq server parameters have been replaced by corresponding
+    oslo.messaging Notify parameters in order to abstract the
+    messaging service from the actual backend server deployment.
+    - swift_oslomsg_notify_servers replaces swift_rabbitmq_telemetry_servers
+    - swift_oslomsg_notify_port replaces swift_rabbitmq_telemetry_port
+    - swift_oslomsg_notify_use_ssl replaces swift_rabbitmq_telemetry_use_ssl
+    - swift_oslomsg_notify_userid replaces swift_rabbitmq_telemetry_userid
+    - swift_oslomsg_notify_vhost replaces swift_rabbitmq_telemetry_vhost
+    - swift_oslomsg_notify_password replaces swift_rabbitmq_telemetry_password
diff --git a/templates/proxy-server.conf.j2 b/templates/proxy-server.conf.j2
index bd80be8e..f68e20b4 100644
--- a/templates/proxy-server.conf.j2
+++ b/templates/proxy-server.conf.j2
@@ -188,7 +188,7 @@ use = egg:swift#xprofile
 paste.filter_factory = ceilometermiddleware.swift:filter_factory
 control_exchange = swift
 driver = messagingv2
-url = rabbit://{% for host in swift_rabbitmq_telemetry_servers.split(',') %}{{ swift_rabbitmq_telemetry_userid }}:{{ swift_rabbitmq_telemetry_password }}@{{ host }}:{{ swift_rabbitmq_telemetry_port }}{% if not loop.last %},{% else %}/{{ swift_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
+url = {{ swift_oslomsg_notify_transport }}://{% for host in swift_oslomsg_notify_servers.split(',') %}{{ swift_oslomsg_notify_userid }}:{{ swift_oslomsg_notify_password }}@{{ host }}:{{ swift_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ swift_oslomsg_notify_vhost }}{% endif %}{% endfor %}
 
 topic = notifications
 {% if swift_gnocchi_service_project_id is defined %}
diff --git a/tests/inventory b/tests/inventory
index 9c6844ad..a13bd56b 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -19,6 +19,9 @@ infra1
 [memcached_all]
 infra1
 
+[oslomsg_notify_all]
+infra1
+
 [service_all:children]
 galera_all
 memcached_all