revert erroneous change to packstack/puppet/templates/amqp.pp

https://review.openstack.org/#/c/168547/ introduced a change to
packstack/puppet/templates/amqp.pp that was not related to the fix and
should not have been included.

Change-Id: I4d7a246e4a8f6de717f8746347378b1dbf49c496
This commit is contained in:
Lars Kellogg-Stedman
2015-03-28 22:37:39 -04:00
parent 8e8216d6b7
commit b576673fb8

View File

@@ -47,16 +47,9 @@ define enable_rabbitmq {
admin_enable => false,
# FIXME: it's ugly to not to require client certs
ssl_fail_if_no_peer_cert => false,
# make sure both NODE_PORT and RABBITMQ_NODE_PORT are unset
# (resolves https://bugzilla.redhat.com/show_bug.cgi?id=1098821).
environment_variables => {
"NODE_PORT" => "",
"RABBITMQ_NODE_PORT" => "",
},
config_variables => {
'tcp_listen_options' => "[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]",
'loopback_users' => "[]",
'tcp_listen_options' => "[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]",
'loopback_users' => "[]",
}
}
} else {