Merge "Add lpmqtt to firehose deployments"

doc/source/firehose.rst

@@ -15,10 +15,12 @@ At a Glance
 :Puppet:
   * https://git.openstack.org/cgit/openstack-infra/puppet-mosquitto
   * https://git.openstack.org/cgit/openstack-infra/puppet-germqtt
-  * :file:`modules/openstack_project/manifests/firehose.pp`
+  * https://git.openstack.org/cgit/openstack-infra/puppet-lpmqtt
+    * :file:`modules/openstack_project/manifests/firehose.pp`
 :Projects:
   * https://mosquitto.org/
   * http://git.openstack.org/cgit/openstack-infra/germqtt/
+  * http://git.openstack.org/cgit/openstack-infra/lpmqtt/
 
 Overview
 ========
@@ -30,7 +32,7 @@ to go for consuming them.
 
 firehose.openstack.org hosts an instance of Mosquitto to be the MQTT broker
 and also locally runs an instance of germqtt to publish the gerrit event
-stream over MQTT.
+stream over MQTT and lpmqtt to publish a launchpad event stream over MQTT.
 
 Connection Info
 ---------------
@@ -57,6 +59,23 @@ hierarchy. `[1]`_
 
 .. _[1]: https://mosquitto.org/man/mqtt-7.html
 
+Services Publishing to firehose
+-------------------------------
+
+As of right now the following services publish messages to the firehose:
+
++-----------+------------+--------------------+
+| Service   | Base Topic | Source of Messages |
++===========+============+====================+
+| gerrit    | gerrit     | `germqtt`_         |
++-----------+------------+--------------------+
+| launchpad | launchpad  | `lpmqtt`_          |
++-----------+------------+--------------------+
+
+.. _germqtt: http://git.openstack.org/cgit/openstack-infra/germqtt/
+.. _lpmqtt: http://git.openstack.org/cgit/openstack-infra/lpmqtt/
+
+
 Client Usage
 ============
 There is no outside access to publishing messages to the firehose available,

manifests/site.pp

@@ -511,6 +511,9 @@ node /^firehose\d+\.openstack\.org$/ {
     ca_file             => hiera('mosquitto_tls_ca_file'),
     cert_file           => hiera('mosquitto_tls_server_cert_file'),
     key_file            => hiera('mosquitto_tls_server_key_file'),
+    imap_hostname       => hiera('lpmqtt_imap_server'),
+    imap_username       => hiera('lpmqtt_imap_username'),
+    imap_password       => hiera('lpmqtt_imap_password'),
   }
 }
 

modules.env

@@ -121,6 +121,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-lodgeit"]="origi
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-log_processor"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-logrotate"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-logstash"]="origin/master"
+INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-lpmqtt"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mailman"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mediawiki"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-meetbot"]="origin/master"

modules/openstack_project/manifests/firehose.pp

@@ -20,6 +20,9 @@ class openstack_project::firehose (
   $gerrit_public_key,
   $gerrit_private_key,
   $gerrit_ssh_host_key,
+  $imap_username,
+  $imap_hostname,
+  $imap_password,
   $mqtt_hostname = 'firehose01.openstack.org',
   $mqtt_password,
   $mqtt_username = 'infra',
@@ -72,4 +75,14 @@ class openstack_project::firehose (
     ],
     require  => Package['cyrus-imapd'],
   }
+
+  include lpmqtt
+  class {'lpmqtt::server':
+    mqtt_username => $mqtt_username,
+    mqtt_password => $mqtt_password,
+    imap_hostname => $imap_hostname,
+    imap_username => $imap_username,
+    imap_password => $imap_password,
+    imap_use_ssl  => true,
+  }
 }