Merge "Update typos"

diff --cc network/ports/ctlplane_vip.yaml
index 3e949f4,da1761b..ab6b18f
--- 1/network/ports/ctlplane_vip.yaml
--- 2/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 1e2fff6,316f810..4180a22
--- 1/network/ports/external.yaml
--- 2/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 d528b32,6e7ad4c..01cdfe9
--- 1/network/ports/internal_api.yaml
--- 2/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 88fb537,35d07ba..1d2384c
--- 1/network/ports/storage.yaml
--- 2/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 c98a21e,346de66..f10e358
--- 1/network/ports/storage_mgmt.yaml
--- 2/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 94408ca,0e8fb2a..ccdc57e
--- 1/network/ports/tenant.yaml
--- 2/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 56efc17,2078fc4..ab6cd2c
--- 1/network/ports/vip.yaml
--- 2/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