aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block-storage-nfs.yaml3
-rw-r--r--block-storage.yaml3
-rw-r--r--cinder-storage.yaml3
-rw-r--r--compute.yaml16
-rw-r--r--controller.yaml4
-rw-r--r--net-config-bond.yaml44
-rw-r--r--net-config-bridge.yaml37
-rw-r--r--net-config-noop.yaml18
-rw-r--r--nova-compute-instance.yaml3
-rw-r--r--overcloud-resource-registry.yaml1
-rw-r--r--overcloud-source.yaml11
-rw-r--r--overcloud-without-mergepy.yaml16
-rw-r--r--swift-storage-source.yaml3
-rw-r--r--swift-storage.yaml3
-rw-r--r--undercloud-bm-nova-deploy.yaml2
-rw-r--r--undercloud-source.yaml3
-rw-r--r--undercloud-vm-ironic-deploy.yaml2
-rw-r--r--undercloud-vm-nova-deploy.yaml2
18 files changed, 150 insertions, 24 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index 49473167..b87ef4e5 100644
--- a/block-storage-nfs.yaml
+++ b/block-storage-nfs.yaml
@@ -5,9 +5,10 @@ parameters:
type: string
default: overcloud-cinder-volume
OvercloudBlockStorageFlavor:
- default: baremetal
description: Flavor for block storage nodes to request when deploying.
type: string
+ constraints:
+ - custom_constraint: nova.flavor
resources:
BlockStorageAccessPolicy:
type: OS::Heat::AccessPolicy
diff --git a/block-storage.yaml b/block-storage.yaml
index 172944aa..c288044a 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -5,9 +5,10 @@ parameters:
type: string
default: overcloud-cinder-volume
OvercloudBlockStorageFlavor:
- default: baremetal
description: Flavor for block storage nodes to request when deploying.
type: string
+ constraints:
+ - custom_constraint: nova.flavor
BlockStorageExtraConfig:
default: {}
description: |
diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index d7145010..b30dcdb6 100644
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -62,9 +62,10 @@ parameters:
}
type: json
Flavor:
- default: baremetal
description: Flavor for block storage nodes to request when deploying.
type: string
+ constraints:
+ - custom_constraint: nova.flavor
GlancePort:
default: "9292"
description: Glance port.
diff --git a/compute.yaml b/compute.yaml
index e3f44700..82698751 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -72,7 +72,6 @@ parameters:
Flavor:
description: Flavor for the nova compute node
type: string
- default: baremetal
constraints:
- custom_constraint: nova.flavor
GlanceHost:
@@ -148,7 +147,7 @@ parameters:
description: An OVS bridge to create for accessing external networks.
type: string
NeutronPublicInterface:
- default: eth0
+ default: nic1
description: A port to add to the NeutronPhysicalBridge.
type: string
NeutronTunnelTypes:
@@ -245,6 +244,19 @@ resources:
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
+ NetworkConfig:
+ type: OS::TripleO::Net::SoftwareConfig
+
+ NetworkDeployment:
+ type: OS::TripleO::SoftwareDeployment
+ properties:
+ signal_transport: NO_SIGNAL
+ config: {get_attr: [NetworkConfig, config_id]}
+ server: {get_resource: NovaCompute}
+ input_values:
+ bridge_name: {get_param: NeutronPhysicalBridge}
+ interface_name: {get_param: NeutronPublicInterface}
+
NovaComputeConfig:
type: OS::TripleO::Compute::SoftwareConfig
diff --git a/controller.yaml b/controller.yaml
index cf5962da..9b3745dc 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -94,7 +94,6 @@ parameters:
}
type: json
Flavor:
- default: baremetal
description: Flavor for control nodes to request when deploying.
type: string
constraints:
@@ -244,7 +243,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:
@@ -637,6 +636,7 @@ resources:
options:
- timeout client 0
- timeout server 0
+ - maxconn 1500
ControllerPassthroughConfig:
type: OS::Heat::StructuredConfig
diff --git a/net-config-bond.yaml b/net-config-bond.yaml
new file mode 100644
index 00000000..3518dbae
--- /dev/null
+++ b/net-config-bond.yaml
@@ -0,0 +1,44 @@
+heat_template_version: 2014-10-16
+
+description: >
+ Software Config to drive os-net-config with 2 bonded nics on a bridge.
+
+resources:
+ OsNetConfigImpl:
+ type: OS::Heat::StructuredConfig
+ properties:
+ group: os-apply-config
+ config:
+ os_net_config:
+ network_config:
+ -
+ type: ovs_bridge
+ name: {get_input: bridge_name}
+ use_dhcp: true
+ # Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284
+ #ovs_extra:
+ # - list_join:
+ # - ' '
+ # - - br-set-external-id
+ # - {get_input: bridge_name}
+ # - bridge-id
+ # - {get_input: bridge_name}
+ members:
+ -
+ type: ovs_bond
+ name: bond1
+ use_dhcp: true
+ members:
+ # os-net-config translates nic1 => em1 (for example)
+ -
+ type: interface
+ name: nic1
+ -
+ type: interface
+ name: nic2
+
+outputs:
+ config_id:
+ description: The ID of the OsNetConfigImpl resource.
+ value:
+ {get_resource: OsNetConfigImpl}
diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml
new file mode 100644
index 00000000..d1faa5df
--- /dev/null
+++ b/net-config-bridge.yaml
@@ -0,0 +1,37 @@
+heat_template_version: 2014-10-16
+
+description: >
+ Software Config to drive os-net-config for a simple bridge.
+
+resources:
+ OsNetConfigImpl:
+ type: OS::Heat::StructuredConfig
+ properties:
+ group: os-apply-config
+ config:
+ os_net_config:
+ network_config:
+ -
+ type: ovs_bridge
+ name: {get_input: bridge_name}
+ use_dhcp: true
+ # Can't do this yet: https://bugs.launchpad.net/heat/+bug/1344284
+ #ovs_extra:
+ # - list_join:
+ # - ' '
+ # - - br-set-external-id
+ # - {get_input: bridge_name}
+ # - bridge-id
+ # - {get_input: bridge_name}
+ members:
+ -
+ type: interface
+ name: {get_input: interface_name}
+ # force the MAC address of the bridge to this interface
+ primary: true
+
+outputs:
+ config_id:
+ description: The ID of the OsNetConfigImpl resource.
+ value:
+ {get_resource: OsNetConfigImpl}
diff --git a/net-config-noop.yaml b/net-config-noop.yaml
new file mode 100644
index 00000000..a3b1d1af
--- /dev/null
+++ b/net-config-noop.yaml
@@ -0,0 +1,18 @@
+heat_template_version: 2014-10-16
+
+description: >
+ Software Config to no-op for os-net-config. Using this will allow you
+ to use the parameter driven (init-neutron-ovs) configuration instead.
+
+resources:
+ OsNetConfigImpl:
+ type: OS::Heat::StructuredConfig
+ properties:
+ group: os-apply-config
+ config:
+
+outputs:
+ config_id:
+ description: The ID of the OsNetConfigImpl resource.
+ value:
+ {get_resource: OsNetConfigImpl}
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 55f3a04b..9a9f40db 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -169,7 +169,8 @@ parameters:
OvercloudComputeFlavor:
description: Use this flavor
type: string
- default: baremetal
+ constraints:
+ - custom_constraint: nova.flavor
RabbitHost:
type: string
RabbitUserName:
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index 4ac404ee..476758b0 100644
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -3,5 +3,6 @@ resource_registry:
OS::TripleO::Compute: compute.yaml
OS::TripleO::Compute::SoftwareConfig: compute-config.yaml
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
+ OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml
OS::TripleO::Controller: controller.yaml
OS::TripleO::ObjectStorage: swift-storage.yaml
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 30896598..ba41bcb8 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -151,7 +151,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
ImageUpdatePolicy:
@@ -234,7 +234,7 @@ parameters:
type: string
hidden: true
NeutronPublicInterface:
- default: eth0
+ default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NeutronPublicInterfaceDefaultRoute:
@@ -317,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:
@@ -800,6 +798,7 @@ resources:
options:
- timeout client 0
- timeout server 0
+ - maxconn 1500
controllerPassthrough:
type: OS::Heat::StructuredConfig
properties:
@@ -924,6 +923,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:
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index dd7c2639..a9f49719 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
@@ -652,6 +652,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
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 10155df9..176925b6 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -2,9 +2,10 @@ heat_template_version: 2013-05-23
description: 'Common Swift Storage Configuration'
parameters:
OvercloudSwiftStorageFlavor:
- default: baremetal
description: Flavor for Swift storage nodes to request when deploying.
type: string
+ constraints:
+ - custom_constraint: nova.flavor
SwiftReplicas:
type: number
default: 1
diff --git a/swift-storage.yaml b/swift-storage.yaml
index 2b40e800..ea032b96 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -43,9 +43,10 @@ parameters:
}
type: json
Flavor:
- default: baremetal
description: Flavor for Swift storage nodes to request when deploying.
type: string
+ constraints:
+ - custom_constraint: nova.flavor
HashSuffix:
default: unset
description: A random string to be used as a salt when hashing to determine mappings
diff --git a/undercloud-bm-nova-deploy.yaml b/undercloud-bm-nova-deploy.yaml
index d46fc076..dca68329 100644
--- a/undercloud-bm-nova-deploy.yaml
+++ b/undercloud-bm-nova-deploy.yaml
@@ -1,6 +1,6 @@
parameters:
NeutronPublicInterface:
- default: eth2
+ default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver:
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 18527e53..0b126146 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -74,9 +74,10 @@ parameters:
}
type: json
Flavor:
- default: baremetal
description: Flavor to request when deploying.
type: string
+ constraints:
+ - custom_constraint: nova.flavor
GlanceLogFile:
description: The filepath of the file to use for logging messages from Glance.
type: string
diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml
index 3bf32a76..5d23495c 100644
--- a/undercloud-vm-ironic-deploy.yaml
+++ b/undercloud-vm-ironic-deploy.yaml
@@ -4,7 +4,7 @@ parameters:
description: Ironic password for keystone access
hidden: true
NeutronPublicInterface:
- default: eth0
+ default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver:
diff --git a/undercloud-vm-nova-deploy.yaml b/undercloud-vm-nova-deploy.yaml
index c6278a1b..da15b46d 100644
--- a/undercloud-vm-nova-deploy.yaml
+++ b/undercloud-vm-nova-deploy.yaml
@@ -1,6 +1,6 @@
parameters:
NeutronPublicInterface:
- default: eth0
+ default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver: