openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove forced rabbitmq::file_limit conversion to string"

Browse Source
This commit is contained in:
Jenkins 2016-03-17 21:52:33 +00:00 committed by Gerrit Code Review
commit bf0f8d0f41
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
puppet/controller.yaml
View File

@ -1195,16 +1195,9 @@ resources:
rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
rabbit_client_port: {get_param: RabbitClientPort}
rabbit_ipv6: {get_param: RabbitIPv6}
rabbit_fd_limit: {get_param: RabbitFDLimit}
mongodb_no_journal: {get_param: MongoDbNoJournal}
mongodb_ipv6: {get_param: MongoDbIPv6}
# We need to force this into quotes or hiera will return integer causing
# the puppet module validation regexp to fail.
# Remove when: https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/401
rabbit_fd_limit:
str_replace:
template: "'LIMIT'"
params:
LIMIT: {get_param: RabbitFDLimit}
ntp_servers: {get_param: NtpServer}
timezone: {get_param: TimeZone}
control_virtual_interface: {get_param: ControlVirtualInterface}