From c2b636fb01ef9c6abd5d90a58fa014b56d515a9e Mon Sep 17 00:00:00 2001
From: Nagasai Vinaykumar Kapalavai <vkapalav@redhat.com>
Date: Fri, 16 Nov 2018 17:05:19 +0000
Subject: [PATCH] Revert "Add a broker connector configuration"

This reverts commit b87634ca57febdcf8c930ecb5bb8adfb92358001.
The above commit contains overlapping of variables,
we need to keep puppet modules as general as possible and add
the customisations at the template level.

Closes-Bug: #1804254
Change-Id: I0e87eb9a086dcf187e2b77f8a129a63f2e6ddd6e
---
 manifests/init.pp            | 17 --------------
 templates/qdrouterd.conf.erb | 43 ------------------------------------
 2 files changed, 60 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 7dc7bc6..f86a569 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -161,23 +161,6 @@ class qdr(
   $listener_ssl_pw_file       = undef,
   $listener_ssl_password      = undef,
   $listener_trusted_certs     = 'UNSET',
-  $connector_addr             = '127.0.0.1',
-  $connector_username         = undef,
-  $connector_password         = undef,
-  $connector_name             = 'broker',
-  $connector_ssl_name         = 'connector',
-  $connector_port             = '61616',
-  $connector_role             = undef,
-  $connector_require_ssl      = false,
-  $connector_require_encrypt  = false,
-  $connector_sasl_mech        = 'ANONYMOUS',
-  $connector_ssl_cert_db      = undef,
-  $connector_ssl_cert_file    = undef,
-  $connector_ssl_key_file     = undef,
-  $connector_ssl_pw_file      = undef,
-  $connector_ssl_password     = undef,
-  $connector_trusted_certs    = 'UNSET',
-  $autolinks_addresses        = [],
   $extra_addresses            = [],
   $log_enable                 = 'debug+',
   $log_module                 = 'DEFAULT',
diff --git a/templates/qdrouterd.conf.erb b/templates/qdrouterd.conf.erb
index 051262f..207fd4b 100644
--- a/templates/qdrouterd.conf.erb
+++ b/templates/qdrouterd.conf.erb
@@ -55,29 +55,6 @@ listener {
 <%- end -%>
 }
 
-<%- if @connector_require_ssl -%>
-sslProfile_connectors {
-    certDb: <%= @connector_ssl_cert_db %>
-    certFile: <%= @connector_ssl_cert_file %>
-    keyFile: <%= @connector_ssl_key_file %>
-}
-<%- end -%>
-
-connector {
-    name: <%= @connector_name %>
-    addr: <%= @connector_addr %>
-    port: <%= @connector_port %>
-    role: <%= @connector_role %>
-<%- if @connector_require_ssl -%>
-    sslprofile: <%= @connector_ssl_name %>
-<%- end -%>
-    saslMechanisms: <%= @connector_sasl_mech %>
-<%- if @connector_sasl_mech == 'PLAIN' -%>
-    saslUsername: <%= @connector_username %>
-    saslPassword: <%= @connector_password %>
-<%- end -%>
-}
-
 <%- end -%>
 <%- @connectors.each do |connector| -%>
 connector {
@@ -102,11 +79,6 @@ address {
     distribution: multicast
 }
 
-address {
-    prefix: queue
-    waypoint: yes
-}
-
 <%- @extra_addresses.each do |address| -%>
 address {
 <%- address.each do |k,v| -%>
@@ -116,21 +88,6 @@ address {
 
 <%- end -%>
 
-autoLink {
-    addr: queue.first
-    direction: in
-    connection: broker
-}
-
-<%- @autolinks_addresses.each do |autoLink| -%>
-autoLink {
-<%- autoLink.each do |k,v| -%>
-    <%= k %>: <%= v %>
-<%- end -%>
-}
-
-<%- end -%>
-
 log {
    module: <%= @log_module %>
    enable: <%= @log_enable %>