Fix typos

Multiple files in t-h-t were having small typos.
Fixed in this patchset.
.
Change-Id: I82d7071747f47544990ed46e2be22931190406b3

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index f47eb9a..c7816b7 100644 (file)
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -5,7 +5,7 @@
 # root_template: identifies repository's root template
 # root_environment: identifies root_environment, this one is special in terms of
 #   order in which the environments are merged before deploying. This one serves as
-#   a base and it's parameters/resource_registry gets overriden by other environments
+#   a base and it's parameters/resource_registry gets overridden by other environments
 #   if used.
 
 # topics:
@@ -21,7 +21,7 @@
 # Attributes:
 #  title: (optional)
 #  description: (optional)
-#  tags: a list of tags to provide aditional information for e.g. filtering (optional)
+#  tags: a list of tags to provide additional information for e.g. filtering (optional)
 #  environments: (required)
 
 # environments:

diff --git a/network/management.yaml b/network/management.yaml
index 9bfaafa..1800b57 100644 (file)
--- a/network/management.yaml
+++ b/network/management.yaml
@@ -16,7 +16,7 @@ parameters:
     type: string
   ManagementNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: The admin state of the network.
     type: boolean
   ManagementNetEnableDHCP:
     default: false

diff --git a/network/ports/external_from_pool.yaml b/network/ports/external_from_pool.yaml
index 98f2aa3..867176e 100644 (file)
--- a/network/ports/external_from_pool.yaml
+++ b/network/ports/external_from_pool.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/from_service.yaml b/network/ports/from_service.yaml
index 359d77a..3d61910 100644 (file)
--- a/network/ports/from_service.yaml
+++ b/network/ports/from_service.yaml
@@ -8,19 +8,19 @@ parameters:
     description: Name of the service to lookup
     default: ''
     type: string
-  NetworkName: # Here for compatability with ctlplane_vip.yaml
+  NetworkName: # Here for compatibility with ctlplane_vip.yaml
     description: Name of the network where the VIP will be created
     default: ctlplane
     type: string
-  PortName: # Here for compatability with ctlplane_vip.yaml
+  PortName: # Here for compatibility with ctlplane_vip.yaml
     description: Name of the port
     default: ''
     type: string
-  ControlPlaneIP: # Here for compatability with ctlplane_vip.yaml
+  ControlPlaneIP: # Here for compatibility with ctlplane_vip.yaml
     description: IP address on the control plane
     default: ''
     type: string
-  ControlPlaneNetwork: # Here for compatability with ctlplane_vip.yaml
+  ControlPlaneNetwork: # Here for compatibility with ctlplane_vip.yaml
     description: The name of the undercloud Neutron control plane
     default: ctlplane
     type: string

diff --git a/network/ports/internal_api_from_pool.yaml b/network/ports/internal_api_from_pool.yaml
index c7b0484..d7b67e2 100644 (file)
--- a/network/ports/internal_api_from_pool.yaml
+++ b/network/ports/internal_api_from_pool.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_from_pool.yaml b/network/ports/storage_from_pool.yaml
index dfc9e75..0a3d394 100644 (file)
--- a/network/ports/storage_from_pool.yaml
+++ b/network/ports/storage_from_pool.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_from_pool.yaml b/network/ports/storage_mgmt_from_pool.yaml
index 9c757a6..c3f0f4e 100644 (file)
--- a/network/ports/storage_mgmt_from_pool.yaml
+++ b/network/ports/storage_mgmt_from_pool.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_from_pool.yaml b/network/ports/tenant_from_pool.yaml
index d5f3156..d5fd708 100644 (file)
--- a/network/ports/tenant_from_pool.yaml
+++ b/network/ports/tenant_from_pool.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/puppet/extraconfig/tls/ca-inject.yaml b/puppet/extraconfig/tls/ca-inject.yaml
index aab4284..f955034 100644 (file)
--- a/puppet/extraconfig/tls/ca-inject.yaml
+++ b/puppet/extraconfig/tls/ca-inject.yaml
@@ -4,7 +4,7 @@ description: >
   This is a template which will inject the trusted anchor.
 
 parameters:
-  # Can be overriden via parameter_defaults in the environment
+  # Can be overridden via parameter_defaults in the environment
   SSLRootCertificate:
     description: >
       The content of a CA's SSL certificate file in PEM format.

diff --git a/puppet/extraconfig/tls/tls-cert-inject.yaml b/puppet/extraconfig/tls/tls-cert-inject.yaml
index 20bb373..77b1137 100644 (file)
--- a/puppet/extraconfig/tls/tls-cert-inject.yaml
+++ b/puppet/extraconfig/tls/tls-cert-inject.yaml
@@ -5,7 +5,7 @@ description: >
   for the load balancer using the given parameters.
 
 parameters:
-  # Can be overriden via parameter_defaults in the environment
+  # Can be overridden via parameter_defaults in the environment
   SSLCertificate:
     description: >
       The content of the SSL certificate (without Key) in PEM format.
@@ -21,7 +21,7 @@ parameters:
     type: string
     hidden: true
 
-  # Can be overriden by parameter_defaults if the user wants to try deploying
+  # Can be overridden by parameter_defaults if the user wants to try deploying
   # this in a distro that doesn't support this path.
   DeployedSSLCertificatePath:
     default: '/etc/pki/tls/private/overcloud_endpoint.pem'

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 4ee2fc9..8980afa 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -34,7 +34,7 @@ $enable_load_balancer = hiera('enable_load_balancer', true)
 
 # When to start and enable services which haven't been Pacemakerized
 # FIXME: remove when we start all OpenStack services using Pacemaker
-# (occurences of this variable will be gradually replaced with false)
+# (occurrences of this variable will be gradually replaced with false)
 $non_pcmk_start = hiera('step') >= 4
 
 if hiera('step') >= 1 {