OpenStack typo

Change Openstack to OpenStack as
per standard

Change-Id: I1ecdbdf529a7c12c0a72869f95984db1fe4e2023

diff --git a/cinder/api/contrib/volume_replication.py b/cinder/api/contrib/volume_replication.py
index 13939bc9edd85d479faade4da55e04f8b3362c85..996a844c7b21c93fc8abc25487185eb7d391e1b4 100644 (file)
--- a/cinder/api/contrib/volume_replication.py
+++ b/cinder/api/contrib/volume_replication.py
@@ -32,7 +32,7 @@ authorize = extensions.soft_extension_authorizer('volume',
 
 
 class VolumeReplicationController(wsgi.Controller):
-    """The Volume Replication API controller for the Openstack API."""
+    """The Volume Replication API controller for the OpenStack API."""
 
     def __init__(self, *args, **kwargs):
         super(VolumeReplicationController, self).__init__(*args, **kwargs)

diff --git a/cinder/volume/drivers/dothill/dothill_fc.py b/cinder/volume/drivers/dothill/dothill_fc.py
index 7c332d99f59340a5363f772b4f54d5529d629c3c..529b31aa441713caf443a6bb2d10aa2b1d057801 100644 (file)
--- a/cinder/volume/drivers/dothill/dothill_fc.py
+++ b/cinder/volume/drivers/dothill/dothill_fc.py
@@ -25,7 +25,7 @@ LOG = logging.getLogger(__name__)
 
 
 class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver):
-    """Openstack Fibre Channel cinder drivers for DotHill Arrays.
+    """OpenStack Fibre Channel cinder drivers for DotHill Arrays.
 
     Version history:
         0.1    - Base version developed for HPMSA FC drivers:

diff --git a/cinder/volume/drivers/dothill/dothill_iscsi.py b/cinder/volume/drivers/dothill/dothill_iscsi.py
index 7aa7803cdfeb53cc7be00d23a6384dd9306dd78a..2b78c0ed963f504e86bc901ed16af16f511abe46 100644 (file)
--- a/cinder/volume/drivers/dothill/dothill_iscsi.py
+++ b/cinder/volume/drivers/dothill/dothill_iscsi.py
@@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__)
 
 
 class DotHillISCSIDriver(cinder.volume.driver.ISCSIDriver):
-    """Openstack iSCSI cinder drivers for DotHill Arrays.
+    """OpenStack iSCSI cinder drivers for DotHill Arrays.
 
     Version history:
         0.1    - Base structure for DotHill iSCSI drivers based on HPMSA FC

diff --git a/cinder/volume/drivers/emc/emc_vmax_masking.py b/cinder/volume/drivers/emc/emc_vmax_masking.py
index c62ba5c26686f27f525d48976ac440bfaa6b1469..f62a141eeeb9287dd27bf95934a40c417d910bd4 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vmax_masking.py
+++ b/cinder/volume/drivers/emc/emc_vmax_masking.py
@@ -867,7 +867,7 @@ class EMCVMAXMasking(object):
                 name = 'world wide port names'
             else:
                 msg = (_("FC is the protocol but wwpns are "
-                         "not supplied by Openstack."))
+                         "not supplied by OpenStack."))
                 LOG.error(msg)
                 raise exception.VolumeBackendAPIException(data=msg)
 

diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/nimble.py
index 190ccbc0f8a8a18f2bef71f8724faa9e657fc6f9..801e87306a7bd8b09387466114ead412c41fb73e 100644 (file)
--- a/cinder/volume/drivers/nimble.py
+++ b/cinder/volume/drivers/nimble.py
@@ -365,9 +365,9 @@ class NimbleISCSIDriver(san.SanISCSIDriver):
         # Get vol info from the volume name obtained from the reference
         vol_info = self.APIExecutor.get_vol_info(target_vol_name)
 
-        # Check if volume is already managed by Openstack
+        # Check if volume is already managed by OpenStack
         if vol_info['agent-type'] == AGENT_TYPE_OPENSTACK:
-            msg = (_('Volume %s is already managed by Openstack.')
+            msg = (_('Volume %s is already managed by OpenStack.')
                    % target_vol_name)
             raise exception.ManageExistingAlreadyManaged(
                 volume_ref=volume['id'])
@@ -381,7 +381,7 @@ class NimbleISCSIDriver(san.SanISCSIDriver):
 
         if vol_info['online']:
             msg = (_('Volume %s is online. Set volume to offline for '
-                     'managing using Openstack.') % target_vol_name)
+                     'managing using OpenStack.') % target_vol_name)
             raise exception.InvalidVolume(reason=msg)
 
         # edit the volume
@@ -421,7 +421,7 @@ class NimbleISCSIDriver(san.SanISCSIDriver):
         # check agent type
         vol_info = self.APIExecutor.get_vol_info(vol_name)
         if vol_info['agent-type'] != AGENT_TYPE_OPENSTACK:
-            msg = (_('Only volumes managed by Openstack can be unmanaged.'))
+            msg = (_('Only volumes managed by OpenStack can be unmanaged.'))
             raise exception.InvalidVolume(reason=msg)
 
         # update the agent-type to None

diff --git a/cinder/volume/drivers/violin/v6000_common.py b/cinder/volume/drivers/violin/v6000_common.py
index 3dfe14d652757b8161814c3d769f6f332ecc3448..aac9b81180054362832643b3f5094ad0a41dcf4e 100644 (file)
--- a/cinder/volume/drivers/violin/v6000_common.py
+++ b/cinder/volume/drivers/violin/v6000_common.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 """
-Violin Memory 6000 Series All-Flash Array Common Driver for Openstack Cinder
+Violin Memory 6000 Series All-Flash Array Common Driver for OpenStack Cinder
 
 Provides common (ie., non-protocol specific) management functions for
 V6000 series flash arrays.

diff --git a/cinder/volume/drivers/violin/v6000_fcp.py b/cinder/volume/drivers/violin/v6000_fcp.py
index 096aeee116531ac4c7f59ab15dd18b4bdcaf25b3..5054f6c0528d14e8cbf43e25e8ce7049e3b85398 100644 (file)
--- a/cinder/volume/drivers/violin/v6000_fcp.py
+++ b/cinder/volume/drivers/violin/v6000_fcp.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 """
-Violin Memory Fibre Channel Driver for Openstack Cinder
+Violin Memory Fibre Channel Driver for OpenStack Cinder
 
 Provides fibre channel specific LUN services for V6000 series flash
 arrays.
@@ -494,13 +494,13 @@ class V6000FCDriver(driver.FibreChannelDriver):
         return self._convert_wwns_vmem_to_openstack(active_gw_fcp_wwns)
 
     def _convert_wwns_openstack_to_vmem(self, wwns):
-        """Convert a list of Openstack WWNs to VMEM compatible WWN strings.
+        """Convert a list of OpenStack WWNs to VMEM compatible WWN strings.
 
         Input format is '50014380186b3f65', output format is
         'wwn.50:01:43:80:18:6b:3f:65'.
 
         Arguments:
-            wwns -- list of Openstack-based WWN strings.
+            wwns -- list of OpenStack-based WWN strings.
 
         Returns:
             output -- list of VMEM-based WWN strings.
@@ -512,7 +512,7 @@ class V6000FCDriver(driver.FibreChannelDriver):
         return output
 
     def _convert_wwns_vmem_to_openstack(self, wwns):
-        """Convert a list of VMEM WWNs to Openstack compatible WWN strings.
+        """Convert a list of VMEM WWNs to OpenStack compatible WWN strings.
 
         Input format is 'wwn.50:01:43:80:18:6b:3f:65', output format
         is '50014380186b3f65'.
@@ -521,7 +521,7 @@ class V6000FCDriver(driver.FibreChannelDriver):
             wwns -- list of VMEM-based WWN strings.
 
         Returns:
-            output -- list of Openstack-based WWN strings.
+            output -- list of OpenStack-based WWN strings.
         """
         output = []
         for w in wwns:

diff --git a/cinder/volume/drivers/violin/v6000_iscsi.py b/cinder/volume/drivers/violin/v6000_iscsi.py
index adad1150b0138bbb8550dba92c9cf1e0c1656a08..726d29400016b4bab0ddd61e0f477156df5976d7 100644 (file)
--- a/cinder/volume/drivers/violin/v6000_iscsi.py
+++ b/cinder/volume/drivers/violin/v6000_iscsi.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 """
-Violin Memory iSCSI Driver for Openstack Cinder
+Violin Memory iSCSI Driver for OpenStack Cinder
 
 Provides iSCSI specific LUN services for V6000 series flash arrays.
 
@@ -266,7 +266,7 @@ class V6000ISCSIDriver(driver.ISCSIDriver):
         """Get a random target IP for OpenStack to connect to.
 
         For the non-multipath case we pick a single random target for
-        the Openstack infrastructure to use.  This at least allows us
+        the OpenStack infrastructure to use.  This at least allows us
         to evenly distribute LUN connections across the storage
         cluster.
         """

diff --git a/cinder/volume/drivers/xio.py b/cinder/volume/drivers/xio.py
index 13ea346f0a1b0f275a2136b7ba9f76e6131aec8a..08b5ca96bf61589f1b224d1d14136d9e87b659f6 100644 (file)
--- a/cinder/volume/drivers/xio.py
+++ b/cinder/volume/drivers/xio.py
@@ -150,7 +150,7 @@ class XIOISEDriver(object):
                 support['thin-clones'] = True
         # Make sure ISE support necessary features
         if not support['clones']:
-            LOG.error(_LE("ISE FW version is not compatible with Openstack!"))
+            LOG.error(_LE("ISE FW version is not compatible with OpenStack!"))
             RaiseXIODriverException()
         # set up thin provisioning support
         self.configuration.san_thin_provision = support['thin-clones']
@@ -802,7 +802,7 @@ class XIOISEDriver(object):
         # Log host creation.
         LOG.debug("Create host %(host)s; %(endpoint)s",
                   {'host': hostname, 'endpoint': endpoint_str})
-        # Issue REST call to create host entry of Openstack type.
+        # Issue REST call to create host entry of OpenStack type.
         params = {}
         params = {'name': hostname, 'endpoint': endpoint_str,
                   'os': 'openstack'}
@@ -1335,7 +1335,7 @@ class XIOISEDriver(object):
                 LOG.error(_LE("Host could not be found!"))
                 RaiseXIODriverException()
         elif string.upper(host['type']) != 'OPENSTACK':
-            # Make sure host type is marked as Openstack host
+            # Make sure host type is marked as OpenStack host
             params = {'os': 'openstack'}
             resp = self._send_cmd('PUT', host['locator'], params)
             status = resp['status']