diff options
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 9de6b7f9..66c782cd 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -259,10 +259,6 @@ parameters: 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 @@ -279,10 +275,6 @@ parameters: 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: | @@ -325,13 +317,11 @@ parameters: type: string default: '' OvercloudComputeFlavor: - default: baremetal description: Flavor for compute nodes to request when deploying. type: string constraints: - custom_constraint: nova.flavor OvercloudControlFlavor: - default: baremetal description: Flavor for control nodes to request when deploying. type: string constraints: @@ -814,6 +804,7 @@ resources: options: - timeout client 0 - timeout server 0 + - maxconn 1500 controllerPassthrough: type: OS::Heat::StructuredConfig properties: @@ -938,6 +929,10 @@ resources: - Merge::Map: controller0: {get_attr: [controller0, name]} + sysctl: + net.ipv4.tcp_keepalive_time: 5 + net.ipv4.tcp_keepalive_probes: 5 + net.ipv4.tcp_keepalive_intvl: 1 controller0SSLDeployment: type: OS::Heat::StructuredDeployment properties: |