diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-05-06 15:12:34 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-05-26 08:50:44 -0400 |
| commit | 7587446c6e1030bb85a019b13ef3a757b4d5fb79 (patch) | |
| tree | 276b32abc8187c77f47e7209761ad972ba060932 | |
| parent | c527d88e9d0ab11b2490713623b2f84f64d71a12 (diff) | |
Add isolated net parameters to net-config stacks
This patch adds parameters so that we can pass in the
ipaddress/subnet for each of the isolated overcloud
traffic nets to os-net-config templates. This
interface change will allow deployers to plug
in a custom version of an os-net-config template
that drives isolated network configuration.
Change-Id: I35bbe9a0bd81e79f9bfd531fe89c700af8b354c4
| -rw-r--r-- | net-config-bond.yaml | 22 | ||||
| -rw-r--r-- | net-config-bridge.yaml | 22 | ||||
| -rw-r--r-- | net-config-noop.yaml | 22 |
3 files changed, 66 insertions, 0 deletions
diff --git a/net-config-bond.yaml b/net-config-bond.yaml index dc4683f1..d41356ac 100644 --- a/net-config-bond.yaml +++ b/net-config-bond.yaml @@ -3,6 +3,28 @@ heat_template_version: 2015-04-30 description: > Software Config to drive os-net-config with 2 bonded nics on a bridge. +parameters: + ExternalIpSubnet: + default: '' + description: IP address/subnet on the external network + type: string + InternalApiIpSubnet: + default: '' + description: IP address/subnet on the internal API network + type: string + StorageIpSubnet: + default: '' + description: IP address/subnet on the storage network + type: string + StorageMgmtIpSubnet: + default: '' + description: IP address/subnet on the storage mgmt network + type: string + TenantIpSubnet: + default: '' + description: IP address/subnet on the tenant network + type: string + resources: OsNetConfigImpl: type: OS::Heat::StructuredConfig diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml index 61090022..a7450c44 100644 --- a/net-config-bridge.yaml +++ b/net-config-bridge.yaml @@ -3,6 +3,28 @@ heat_template_version: 2015-04-30 description: > Software Config to drive os-net-config for a simple bridge. +parameters: + ExternalIpSubnet: + default: '' + description: IP address/subnet on the external network + type: string + InternalApiIpSubnet: + default: '' + description: IP address/subnet on the internal API network + type: string + StorageIpSubnet: + default: '' + description: IP address/subnet on the storage network + type: string + StorageMgmtIpSubnet: + default: '' + description: IP address/subnet on the storage mgmt network + type: string + TenantIpSubnet: + default: '' + description: IP address/subnet on the tenant network + type: string + resources: OsNetConfigImpl: type: OS::Heat::StructuredConfig diff --git a/net-config-noop.yaml b/net-config-noop.yaml index 35cfecc4..70c57aa4 100644 --- a/net-config-noop.yaml +++ b/net-config-noop.yaml @@ -4,6 +4,28 @@ 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. +parameters: + ExternalIpSubnet: + default: '' + description: IP address/subnet on the external network + type: string + InternalApiIpSubnet: + default: '' + description: IP address/subnet on the internal API network + type: string + StorageIpSubnet: + default: '' + description: IP address/subnet on the storage network + type: string + StorageMgmtIpSubnet: + default: '' + description: IP address/subnet on the storage mgmt network + type: string + TenantIpSubnet: + default: '' + description: IP address/subnet on the tenant network + type: string + resources: OsNetConfigImpl: type: OS::Heat::StructuredConfig |