Merge "bump up the number of sesson limit for rabbitmq"

diff --combined controller.yaml
index cf5962d,09115d8..359cbfc
--- 1/controller.yaml
--- 2/controller.yaml
+++ b/controller.yaml
@@@ -158,15 -158,6 +158,15 @@@ parameters
      description: Keystone key for signing tokens.
      type: string
      hidden: true
 +  KeystoneSSLCertificate:
 +    default: ''
 +    description: Keystone certificate for verifying token validity.
 +    type: string
 +  KeystoneSSLCertificateKey:
 +    default: ''
 +    description: Keystone key for signing tokens.
 +    type: string
 +    hidden: true
    MysqlClusterUniquePart:
      description: A unique identifier of the MySQL cluster the controller is in.
      type: string
@@@ -198,28 -189,6 +198,28 @@@
      default: 'dhcp-option-force=26,1400'
      description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead.
      type: string
 +  NeutronAgentMode:
 +    default: 'dvr_snat'
 +    description: Agent mode for the neutron-l3-agent on the controller hosts
 +    type: string
 +  NeutronDVR:
 +    default: 'False'
 +    description: Whether to configure Neutron Distributed Virtual Routers
 +    type: string
 +  NeutronMetadataProxySharedSecret:
 +    default: 'unset'
 +    description: Shared secret to prevent spoofing
 +    type: string
 +  NeutronMechanismDrivers:
 +    default: 'openvswitch'
 +    description: |
 +        The mechanism drivers for the Neutron tenant network. To specify multiple
 +        values, use a comma separated string, like so: 'openvswitch,l2_population'
 +    type: string
 +  NeutronAllowL3AgentFailover:
 +    default: 'True'
 +    description: Allow automatic l3-agent failover
 +    type: string
    NeutronEnableTunnelling:
      type: string
      default: "True"
@@@ -305,16 -274,6 +305,16 @@@
      default: guest
      description: The username for RabbitMQ
      type: string
 +  RabbitClientUseSSL:
 +    default: false
 +    description: >
 +        Rabbit client subscriber parameter to specify
 +        an SSL connection to the RabbitMQ host.
 +    type: string
 +  RabbitClientPort:
 +    default: 5672
 +    description: Set rabbit subscriber port, change this if using SSL
 +    type: number
    SnmpdReadonlyUserName:
      default: ro_snmp_user
      description: The user name for SNMPd with readonly rights running on all Overcloud nodes
@@@ -457,9 -416,6 +457,9 @@@ resources
            ca_certificate: {get_param: KeystoneCACertificate}
            signing_key: {get_param: KeystoneSigningKey}
            signing_certificate: {get_param: KeystoneSigningCertificate}
 +          ssl:
 +              certificate: {get_param: KeystoneSSLCertificate}
 +              certificate_key: {get_param: KeystoneSSLCertificateKey}
          mysql:
            innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
            local_bind: true
@@@ -473,11 -429,7 +473,11 @@@
            debug: {get_param: Debug}
            flat-networks: {get_param: NeutronFlatNetworks}
            host: {get_input: controller_virtual_ip}
 -          metadata_proxy_shared_secret: unset
 +          metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
 +          agent_mode: {get_param: NeutronAgentMode}
 +          router_distributed: {get_param: NeutronDVR}
 +          mechanism_drivers: {get_param: NeutronMechanismDrivers}
 +          allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
            ovs:
              enable_tunneling: {get_input: neutron_enable_tunneling}
              local_ip: {get_input: controller_host}
@@@ -530,8 -482,6 +530,8 @@@
            username: {get_param: RabbitUserName}
            password: {get_param: RabbitPassword}
            cookie: {get_param: RabbitCookie}
 +          rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
 +          rabbit_port: {get_param: RabbitClientPort}
          ntp:
            servers:
                - {server: {get_param: NtpServer}, fudge: "stratum 0"}
@@@ -569,8 -519,6 +569,8 @@@
          haproxy:
            net_binds:
              - ip: {get_param: VirtualIP}
 +          options:
 +            - option httpchk GET /
            services:
              - name: keystone_admin
                port: 35357
@@@ -595,7 -543,6 +595,7 @@@
              - name: glance_registry
                port: 9191
                net_binds: *public_binds
 +              options: # overwrite options as glace_reg needs auth for http req
              - name: heat_api
                port: 8004
                net_binds: *public_binds
@@@ -620,23 -567,18 +620,24 @@@
              - name: nova_metadata
                port: 8775
                net_binds: *public_binds
 +            - name: nova_novncproxy
 +              port: 6080
 +              net_binds: *public_binds
              - name: ceilometer
                port: 8777
                net_binds: *public_binds
 +              options: # overwrite options as ceil needs auth for http req
              - name: swift_proxy_server
                port: 8080
                net_binds: *public_binds
 +              options:
 +                - option httpchk GET /info
              - name: rabbitmq
                port: 5672
                options:
                  - timeout client 0
                  - timeout server 0
+                 - maxconn 1500
  
    ControllerPassthroughConfig:
      type: OS::Heat::StructuredConfig

diff --combined overcloud-source.yaml
index 914f187,bbce9f3..37de283
--- 1/overcloud-source.yaml
--- 2/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@@ -186,6 -186,27 +186,6 @@@ parameters
      description: Keystone key for signing tokens.
      type: string
      hidden: true
 -  LiveUpdateComputeImage:
 -    type: string
 -    description: The image ID for live-updates to the overcloud compute nodes.
 -    default: ''
 -  LiveUpdateHost:
 -    type: string
 -    description: The IP address for the undercloud Glance API.
 -    default: ''
 -  LiveUpdatePassword:
 -    type: string
 -    default: ''
 -    description: The live-update password for the undercloud Glance API.
 -    hidden: true
 -  LiveUpdateTenantName:
 -    type: string
 -    description: The live-update tenant name for the undercloud Glance API.
 -    default: ''
 -  LiveUpdateUserName:
 -    type: string
 -    description: The live-update username for the undercloud Glance API.
 -    default: ''
    MysqlInnodbBufferPoolSize:
      description: >
          Specifies the size of the buffer pool in megabytes. Setting to
@@@ -259,6 -280,10 +259,6 @@@
        overcloud.yaml to include the deployment of VLAN ports to the control
        plane.
      type: string
 -  NeutronPublicInterfaceRawDevice:
 -    default: ''
 -    description: If set, the public interface is a vlan with this device as the raw device.
 -    type: string
    NeutronComputeAgentMode:
      default: 'dvr'
      description: Agent mode for the neutron-l3-agent on the compute hosts
@@@ -275,6 -300,10 +275,6 @@@
      default: 'unset'
      description: Shared secret to prevent spoofing
      type: string
 -  NeutronNetworkType:
 -    default: 'gre'
 -    description: The tenant network type for Neutron, either gre or vxlan.
 -    type: string
    NeutronTunnelTypes:
      default: 'gre'
      description: |
@@@ -806,6 -835,7 +806,7 @@@ resources
                options:
                  - timeout client 0
                  - timeout server 0
+                 - maxconn 1500
    controllerPassthrough:
      type: OS::Heat::StructuredConfig
      properties: