aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 11:44:04 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 11:44:04 +0000
commita526c10ac920abd4b55321764221875c80dd3bb8 (patch)
tree458d36950e02ef1de8d30f8757e86bd7f057c615
parentfe9068580b56c205c123c378b2b564830f4f1ea4 (diff)
parent8db8040e8b7a2298352e2facab457224a55e1987 (diff)
Merge "Include oslo.messaging amqp support for rpc and notifications"
-rw-r--r--manifests/profile/base/keystone.pp4
-rw-r--r--releasenotes/notes/messaging-amqp-7efec1bcb435e7cf.yaml4
2 files changed, 8 insertions, 0 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 937f5e2..9598d64 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -195,6 +195,10 @@ class tripleo::profile::base::keystone (
}),
}
+ if 'amqp' in [$oslomsg_rpc_proto, $oslomsg_notify_proto]{
+ include ::keystone::messaging::amqp
+ }
+
include ::keystone::config
class { '::keystone::wsgi::apache':
ssl_cert => $tls_certfile,
diff --git a/releasenotes/notes/messaging-amqp-7efec1bcb435e7cf.yaml b/releasenotes/notes/messaging-amqp-7efec1bcb435e7cf.yaml
new file mode 100644
index 0000000..b6f211c
--- /dev/null
+++ b/releasenotes/notes/messaging-amqp-7efec1bcb435e7cf.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - Include the amqp messaging class when the oslo.messaging rpc
+ protocol is enabled for AMQP 1.0.