From: Jenkins Date: Fri, 11 Dec 2015 14:26:25 +0000 (+0000) Subject: Merge "Update typos" X-Git-Tag: opnfv-6.0.0~2264 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f58c23abc91cf00ebe7e8bb044cae480743e9dac;p=apex-tripleo-heat-templates.git Merge "Update typos" --- f58c23abc91cf00ebe7e8bb044cae480743e9dac diff --cc network/ports/ctlplane_vip.yaml index 3e949f41,da1761b6..ab6b18f8 --- a/network/ports/ctlplane_vip.yaml +++ b/network/ports/ctlplane_vip.yaml @@@ -13,9 -13,8 +13,9 @@@ parameters description: Name of the port default: '' type: string - ControlPlaneIP: # Here for compatability with noop.yaml + ControlPlaneIP: # Here for compatibility with noop.yaml description: IP address on the control plane + default: '' type: string ControlPlaneNetwork: description: The name of the undercloud Neutron control plane diff --cc network/ports/external.yaml index 1e2fff68,316f8109..4180a223 --- a/network/ports/external.yaml +++ b/network/ports/external.yaml @@@ -13,9 -13,8 +13,9 @@@ parameters description: Name of the port default: '' type: string - ControlPlaneIP: # Here for compatability with noop.yaml + ControlPlaneIP: # Here for compatibility with noop.yaml description: IP address on the control plane + default: '' type: string ControlPlaneNetwork: # Here for compatibility with ctlplane_vip.yaml description: The name of the undercloud Neutron control plane diff --cc network/ports/internal_api.yaml index d528b327,6e7ad4c2..01cdfe9b --- a/network/ports/internal_api.yaml +++ b/network/ports/internal_api.yaml @@@ -12,16 -12,9 +12,16 @@@ parameters description: Name of the port default: '' type: string - ControlPlaneIP: # Here for compatability with noop.yaml + ControlPlaneIP: # Here for compatibility 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 88fb537c,35d07ba6..1d2384c5 --- a/network/ports/storage.yaml +++ b/network/ports/storage.yaml @@@ -12,16 -12,9 +12,16 @@@ parameters description: Name of the port default: '' type: string - ControlPlaneIP: # Here for compatability with noop.yaml + ControlPlaneIP: # Here for compatibility 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 c98a21ef,346de665..f10e3582 --- a/network/ports/storage_mgmt.yaml +++ b/network/ports/storage_mgmt.yaml @@@ -12,16 -12,9 +12,16 @@@ parameters description: Name of the port default: '' type: string - ControlPlaneIP: # Here for compatability with noop.yaml + ControlPlaneIP: # Here for compatibility 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 94408ca2,0e8fb2ae..ccdc57ee --- a/network/ports/tenant.yaml +++ b/network/ports/tenant.yaml @@@ -12,16 -12,9 +12,16 @@@ parameters description: Name of the port default: '' type: string - ControlPlaneIP: # Here for compatability with noop.yaml + ControlPlaneIP: # Here for compatibility 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/vip.yaml index 56efc178,2078fc48..ab6cd2c0 --- a/network/ports/vip.yaml +++ b/network/ports/vip.yaml @@@ -13,9 -13,8 +13,9 @@@ parameters description: Name of the port default: '' type: string - ControlPlaneIP: # Here for compatability with noop.yaml + ControlPlaneIP: # Here for compatibility with noop.yaml description: IP address on the control plane + default: '' type: string ControlPlaneNetwork: description: The name of the undercloud Neutron control plane