From: Jenkins Date: Thu, 3 Dec 2015 14:36:37 +0000 (+0000) Subject: Merge "Make all network ports type to consume FixedIPs" X-Git-Tag: opnfv-6.0.0~2273 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3bf96c7462b0c3cd6a8d6bc8d134c9d698f6dd6e;p=apex-tripleo-heat-templates.git Merge "Make all network ports type to consume FixedIPs" --- 3bf96c7462b0c3cd6a8d6bc8d134c9d698f6dd6e diff --cc network/ports/internal_api.yaml index b671aa5f,711ee17c..d528b327 --- a/network/ports/internal_api.yaml +++ b/network/ports/internal_api.yaml @@@ -14,8 -14,13 +14,14 @@@ parameters type: string ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane + default: '' type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: diff --cc network/ports/storage.yaml index e1ef8e03,e013619c..88fb537c --- a/network/ports/storage.yaml +++ b/network/ports/storage.yaml @@@ -14,8 -14,13 +14,14 @@@ parameters type: string ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane + default: '' type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: diff --cc network/ports/storage_mgmt.yaml index e5b5b884,76afae01..c98a21ef --- a/network/ports/storage_mgmt.yaml +++ b/network/ports/storage_mgmt.yaml @@@ -14,8 -14,13 +14,14 @@@ parameters type: string ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane + default: '' type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: diff --cc network/ports/tenant.yaml index 9a351a24,6e8ad482..94408ca2 --- a/network/ports/tenant.yaml +++ b/network/ports/tenant.yaml @@@ -14,8 -14,13 +14,14 @@@ parameters type: string ControlPlaneIP: # Here for compatability with noop.yaml description: IP address on the control plane + default: '' type: string + FixedIPs: + description: > + Control the IP allocation for the VIP port. E.g. + [{'ip_address':'1.2.3.4'}] + default: [] + type: json resources: