Merge "Parameterize RabbitMQ FD limit"

diff --combined overcloud-without-mergepy.yaml
index 62e156f,9af7ef9..9605f3f
--- 1/overcloud-without-mergepy.yaml
--- 2/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@@ -253,6 -253,11 +253,11 @@@ parameters
      default: 5672
      description: Set rabbit subscriber port, change this if using SSL
      type: number
+   # We need to set this as string because 'unlimited' is a valid setting
+   RabbitFDLimit:
+     default: 16384
+     description: Configures RabbitMQ FD limit
+     type: string
    SnmpdReadonlyUserName:
      default: ro_snmp_user
      description: The user name for SNMPd with readonly rights running on all Overcloud nodes
@@@ -833,6 -838,7 +838,7 @@@ resources
            RabbitCookie: {get_attr: [RabbitCookie, value]}
            RabbitClientUseSSL: {get_param: RabbitClientUseSSL}
            RabbitClientPort: {get_param: RabbitClientPort}
+           RabbitFDLimit: {get_param: RabbitFDLimit}
            SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName}
            SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword}
            RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
@@@ -848,13 -854,9 +854,13 @@@
            VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} # deprecated. Use per service VIP settings instead now.
            PublicVirtualIP: {get_attr: [PublicVirtualIP, ip_address]}
            ServiceNetMap: {get_param: ServiceNetMap}
 +          CeilometerApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
 +          CinderApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
            HeatApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
            GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
            GlanceRegistryVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
 +          NovaApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
 +          SwiftProxyVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
            MysqlVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
            KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
            KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}

diff --combined puppet/controller.yaml
index aacd140,1674e4d..9252486
--- 1/puppet/controller.yaml
--- 2/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -14,9 -14,6 +14,9 @@@ parameters
      description: The keystone auth secret and db password.
      type: string
      hidden: true
 +  CeilometerApiVirtualIP:
 +    type: string
 +    default: ''
    CeilometerBackend:
      default: 'mongodb'
      description: The ceilometer backend type.
@@@ -31,9 -28,6 +31,9 @@@
      description: The password for the ceilometer service  and db account.
      type: string
      hidden: true
 +  CinderApiVirtualIP:
 +    type: string
 +    default: ''
    CinderEnableNfsBackend:
      default: false
      description: Whether to enable or not the NFS backend for Cinder
@@@ -405,9 -399,6 +405,9 @@@
          of VXLAN VNI IDs that are available for tenant network allocation
      default: ["1:1000", ]
      type: comma_delimited_list
 +  NovaApiVirtualIP:
 +    type: string
 +    default: ''
    NovaPassword:
      default: unset
      description: The password for the nova service and db account, used by nova-api.
@@@ -455,6 -446,10 +455,10 @@@
      default: 5672
      description: Set rabbit subscriber port, change this if using SSL
      type: number
+   RabbitFDLimit:
+     default: 16384
+     description: Configures RabbitMQ FD limit
+     type: string
    RedisVirtualIP:
      type: string
      default: ''  # Has to be here because of the ignored empty value bug
@@@ -505,9 -500,6 +509,9 @@@
        services.
      hidden: true
      type: string
 +  SwiftProxyVirtualIP:
 +    type: string
 +    default: ''
    SwiftReplicas:
      type: number
      default: 3
@@@ -894,6 -886,14 +898,14 @@@ resources
          rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
          rabbit_client_port: {get_param: RabbitClientPort}
          mongodb_no_journal: {get_param: MongoDbNoJournal}
+         # 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:
            str_replace:
              template: '["server"]'
@@@ -1208,6 -1208,7 +1220,7 @@@
                  # Rabbit
                  rabbitmq::node_ip_address: {get_input: rabbitmq_network}
                  rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
+                 rabbitmq::file_limit: {get_input: rabbit_fd_limit}
                  # Redis
                  redis::bind: {get_input: redis_network}
                  redis_vip: {get_input: redis_vip}