Merge "Update typos"

14 files changed, 14 insertions, 14 deletions

diff --git a/firstboot/userdata_heat_admin.yaml b/firstboot/userdata_heat_admin.yaml
index 73481c63..f8891b29 100644
--- a/firstboot/userdata_heat_admin.yaml
+++ b/firstboot/userdata_heat_admin.yaml
@@ -1,7 +1,7 @@
 heat_template_version: 2014-10-16
 
 parameters:
-  # Can be overriden via parameter_defaults in the environment
+  # Can be overridden via parameter_defaults in the environment
   node_admin_username:
     type: string
     default: heat-admin
diff --git a/network/external.yaml b/network/external.yaml
index e8f92a5e..3b24da7e 100644
--- a/network/external.yaml
+++ b/network/external.yaml
@@ -15,7 +15,7 @@ parameters:
     type: json
   ExternalNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   ExternalNetEnableDHCP:
     default: false
diff --git a/network/internal_api.yaml b/network/internal_api.yaml
index 69154bef..6f8aa3a8 100644
--- a/network/internal_api.yaml
+++ b/network/internal_api.yaml
@@ -15,7 +15,7 @@ parameters:
     type: json
   InternalApiNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   InternalApiNetEnableDHCP:
     default: false
diff --git a/network/ports/ctlplane_vip.yaml b/network/ports/ctlplane_vip.yaml
index 3e949f41..ab6b18f8 100644
--- a/network/ports/ctlplane_vip.yaml
+++ b/network/ports/ctlplane_vip.yaml
@@ -13,7 +13,7 @@ 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
diff --git a/network/ports/external.yaml b/network/ports/external.yaml
index 1e2fff68..4180a223 100644
--- a/network/ports/external.yaml
+++ b/network/ports/external.yaml
@@ -13,7 +13,7 @@ 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
diff --git a/network/ports/internal_api.yaml b/network/ports/internal_api.yaml
index d528b327..01cdfe9b 100644
--- a/network/ports/internal_api.yaml
+++ b/network/ports/internal_api.yaml
@@ -12,7 +12,7 @@ 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
diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml
index 31ee6f3c..028624fd 100644
--- a/network/ports/noop.yaml
+++ b/network/ports/noop.yaml
@@ -16,7 +16,7 @@ parameters:
     default: ''
     type: string
   NetworkName:
-    description: # Here for compatability with vip.yaml
+    description: # Here for compatibility with vip.yaml
     default: ''
     type: string
   FixedIPs:
diff --git a/network/ports/storage.yaml b/network/ports/storage.yaml
index 88fb537c..1d2384c5 100644
--- a/network/ports/storage.yaml
+++ b/network/ports/storage.yaml
@@ -12,7 +12,7 @@ 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
diff --git a/network/ports/storage_mgmt.yaml b/network/ports/storage_mgmt.yaml
index c98a21ef..f10e3582 100644
--- a/network/ports/storage_mgmt.yaml
+++ b/network/ports/storage_mgmt.yaml
@@ -12,7 +12,7 @@ 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
diff --git a/network/ports/tenant.yaml b/network/ports/tenant.yaml
index 94408ca2..ccdc57ee 100644
--- a/network/ports/tenant.yaml
+++ b/network/ports/tenant.yaml
@@ -12,7 +12,7 @@ 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
diff --git a/network/ports/vip.yaml b/network/ports/vip.yaml
index 56efc178..ab6cd2c0 100644
--- a/network/ports/vip.yaml
+++ b/network/ports/vip.yaml
@@ -13,7 +13,7 @@ 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
diff --git a/network/storage.yaml b/network/storage.yaml
index 60b779e0..dc9f35ea 100644
--- a/network/storage.yaml
+++ b/network/storage.yaml
@@ -15,7 +15,7 @@ parameters:
     type: json
   StorageNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   StorageNetEnableDHCP:
     default: false
diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
index 043bc87b..59933c8c 100644
--- a/network/storage_mgmt.yaml
+++ b/network/storage_mgmt.yaml
@@ -15,7 +15,7 @@ parameters:
     type: json
   StorageMgmtNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   StorageMgmtNetEnableDHCP:
     default: false
diff --git a/network/tenant.yaml b/network/tenant.yaml
index daf5cb75..6fe96121 100644
--- a/network/tenant.yaml
+++ b/network/tenant.yaml
@@ -15,7 +15,7 @@ parameters:
     type: json
   TenantNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   TenantNetEnableDHCP:
     default: false