From 9e9273a8e5211f8e9b701c291ad332d5375e2198 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 16 Nov 2015 13:49:00 +0100 Subject: Make all network ports type to consume FixedIPs This change adds to the internal_api, storage, storage_mgmt and tenant network ports the FixedIPs param and make them consume it when passed. Change-Id: Ica2bca9f573b206cc60c9d572224a8cc7b9b8aa4 --- network/ports/internal_api.yaml | 7 +++++++ network/ports/storage.yaml | 7 +++++++ network/ports/storage_mgmt.yaml | 7 +++++++ network/ports/tenant.yaml | 7 +++++++ 4 files changed, 28 insertions(+) (limited to 'network/ports') diff --git a/network/ports/internal_api.yaml b/network/ports/internal_api.yaml index da1b1856..711ee17c 100644 --- a/network/ports/internal_api.yaml +++ b/network/ports/internal_api.yaml @@ -15,6 +15,12 @@ parameters: ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: @@ -23,6 +29,7 @@ resources: properties: network: {get_param: InternalApiNetName} name: {get_param: PortName} + fixed_ips: {get_param: FixedIPs} replacement_policy: AUTO outputs: diff --git a/network/ports/storage.yaml b/network/ports/storage.yaml index ecb20b8f..e013619c 100644 --- a/network/ports/storage.yaml +++ b/network/ports/storage.yaml @@ -15,6 +15,12 @@ parameters: ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: @@ -23,6 +29,7 @@ resources: properties: network: {get_param: StorageNetName} name: {get_param: PortName} + fixed_ips: {get_param: FixedIPs} replacement_policy: AUTO outputs: diff --git a/network/ports/storage_mgmt.yaml b/network/ports/storage_mgmt.yaml index 2ab39f21..76afae01 100644 --- a/network/ports/storage_mgmt.yaml +++ b/network/ports/storage_mgmt.yaml @@ -15,6 +15,12 @@ parameters: ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: @@ -23,6 +29,7 @@ resources: properties: network: {get_param: StorageMgmtNetName} name: {get_param: PortName} + fixed_ips: {get_param: FixedIPs} replacement_policy: AUTO outputs: diff --git a/network/ports/tenant.yaml b/network/ports/tenant.yaml index aae12d46..6e8ad482 100644 --- a/network/ports/tenant.yaml +++ b/network/ports/tenant.yaml @@ -15,6 +15,12 @@ parameters: ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: @@ -23,6 +29,7 @@ resources: properties: network: {get_param: TenantNetName} name: {get_param: PortName} + fixed_ips: {get_param: FixedIPs} replacement_policy: AUTO outputs: -- cgit 1.2.3-korg