diff options
Diffstat (limited to 'overcloud-without-mergepy.yaml')
| -rw-r--r-- | overcloud-without-mergepy.yaml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index ab7f17ca..7578cc2a 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -94,7 +94,7 @@ parameters: type: string hidden: true NeutronPublicInterface: - default: eth0 + default: nic1 description: What interface to bridge onto br-ex for network nodes. type: string NeutronPublicInterfaceTag: @@ -226,7 +226,6 @@ parameters: constraints: - custom_constraint: glance.image OvercloudControlFlavor: - default: baremetal description: Flavor for control nodes to request when deploying. type: string constraints: @@ -398,7 +397,7 @@ parameters: the openvswitch agent. Typically should not need to be changed. type: string HypervisorNeutronPublicInterface: - default: 'eth0' + default: nic1 description: What interface to add to the HypervisorNeutronPhysicalBridge. type: string NeutronNetworkVLANRanges: @@ -428,7 +427,6 @@ parameters: OvercloudComputeFlavor: description: Use this flavor type: string - default: baremetal constraints: - custom_constraint: nova.flavor @@ -440,18 +438,20 @@ parameters: default: overcloud-cinder-volume type: string OvercloudBlockStorageFlavor: - default: baremetal description: Flavor for block storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor # Object storage specific parameters ObjectStorageCount: type: number default: 0 OvercloudSwiftStorageFlavor: - default: baremetal description: Flavor for Swift storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor SwiftStorageImage: default: overcloud-swift-storage type: string @@ -640,6 +640,10 @@ resources: list_join: - ',' - {get_attr: [Controller, hostname]} + sysctl: + net.ipv4.tcp_keepalive_time: 5 + net.ipv4.tcp_keepalive_probes: 5 + net.ipv4.tcp_keepalive_intvl: 1 MysqlRootPassword: type: OS::Heat::RandomString |