Ottomata has submitted this change and it was merged.

Change subject: Update eventlogging topic parameter to use new format
......................................................................


Update eventlogging topic parameter to use new format

Change-Id: I8aebb02ec91e659833c3e7082758fe66941108fa
---
M manifests/role/eventlogging.pp
1 file changed, 1 insertion(+), 11 deletions(-)

Approvals:
  Ottomata: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 77f6b21..5b963e5 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -50,17 +50,7 @@
     # Read in server side and client side raw events from
     # Kafka, process them, and send events to schema
     # based topics in Kafka.
-
-    # NOTE:
-    # eventlogging in beta labs is running the service 'EventBus' branch, which
-    # has changed the way topics are interpolated.  This conditional will
-    # be removed when we deploy this to prod as well.
-    if $::realm == 'labs' {
-        $kafka_schema_uri  = "${kafka_base_uri}?topic=eventlogging_{schema}"
-    }
-    else {
-        $kafka_schema_uri  = "${kafka_base_uri}?topic=eventlogging_%(schema)s"
-    }
+    $kafka_schema_uri  = "${kafka_base_uri}?topic=eventlogging_{schema}"
 
     # The downstream eventlogging MySQL consumer expects schemas to be
     # all mixed up in a single stream.  We send processed events to a

-- 
To view, visit https://gerrit.wikimedia.org/r/257644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8aebb02ec91e659833c3e7082758fe66941108fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to