openstack/puppet-qdr
Code Issues Proposed changes

Revert "Add a broker connector configuration"

Browse Source 
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
This commit is contained in:
Nagasai Vinaykumar Kapalavai 2018-11-16 17:05:19 +00:00
parent 4b208031f1
commit c2b636fb01
2 changed files with 0 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@ -161,23 +161,6 @@ class qdr(
$listener_ssl_pw_file = undef, $listener_ssl_pw_file = undef,
$listener_ssl_password = undef, $listener_ssl_password = undef,
$listener_trusted_certs = 'UNSET', $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 = [], $extra_addresses = [],
$log_enable = 'debug+', $log_enable = 'debug+',
$log_module = 'DEFAULT', $log_module = 'DEFAULT',

43
templates/qdrouterd.conf.erb
View File

@ -55,29 +55,6 @@ listener {
<%- end -%> <%- 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 -%> <%- end -%>
<%- @connectors.each do |connector| -%> <%- @connectors.each do |connector| -%>
connector { connector {
@ -102,11 +79,6 @@ address {
distribution: multicast distribution: multicast
} }
address {
prefix: queue
waypoint: yes
}
<%- @extra_addresses.each do |address| -%> <%- @extra_addresses.each do |address| -%>
address { address {
<%- address.each do |k,v| -%> <%- address.each do |k,v| -%>
@ -116,21 +88,6 @@ address {
<%- end -%> <%- 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 { log {
module: <%= @log_module %> module: <%= @log_module %>
enable: <%= @log_enable %> enable: <%= @log_enable %>