From c613c0886959eddac280280da1c92af568e9efaa Mon Sep 17 00:00:00 2001 From: Kamal Nasser Date: Fri, 8 Aug 2014 22:16:37 +0300 Subject: [PATCH] Replace all occurrences of "Digital Ocean" with "DigitalOcean" --- doc/man/salt.7 | 34 +++++++++---------- doc/topics/cloud/cloud.rst | 2 +- doc/topics/cloud/config.rst | 6 ++-- doc/topics/cloud/digitalocean.rst | 8 ++--- doc/topics/cloud/index.rst | 2 +- doc/topics/cloud/releases/0.8.7.rst | 8 ++--- doc/topics/development/tests/index.rst | 4 +-- salt/cloud/clouds/digital_ocean.py | 16 ++++----- .../cloud/providers/digital_ocean.py | 4 +-- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/doc/man/salt.7 b/doc/man/salt.7 index 7ad25eccad..5faee9bd4f 100644 --- a/doc/man/salt.7 +++ b/doc/man/salt.7 @@ -13251,7 +13251,7 @@ required by the developer. When this is the case, some or all of the functions in \fBlibcloudfuncs\fP may be replaced. If they are all replaced, the libcloud imports should be absent from the Salt Cloud module. .sp -A good example of a non\-libcloud provider is the Digital Ocean module: +A good example of a non\-libcloud provider is the DigitalOcean module: .sp \fI\%https://github.com/saltstack/salt/blob/develop/salt/cloud/clouds/digital_ocean.py\fP .SS The \fBcreate()\fP Function @@ -14159,10 +14159,10 @@ my\-openstack\-config: .fi .UNINDENT .UNINDENT -.SS Digital Ocean +.SS DigitalOcean .sp -Using Salt for Digital Ocean requires a client_key and an api_key. These can be -found in the Digital Ocean web interface, in the "My Settings" section, under +Using Salt for DigitalOcean requires a client_key and an api_key. These can be +found in the DigitalOcean web interface, in the "My Settings" section, under the API Access tab. .INDENT 0.0 .IP \(bu 2 @@ -14724,16 +14724,16 @@ script_args: | head .fi .UNINDENT .UNINDENT -.SS Getting Started With Digital Ocean +.SS Getting Started With DigitalOcean .sp -Digital Ocean is a public cloud provider that specializes in Linux instances. +DigitalOcean is a public cloud provider that specializes in Linux instances. .SS Dependencies .sp -The Digital Ocean driver requires no special dependencies outside of Salt. +The DigitalOcean driver requires no special dependencies outside of Salt. .SS Configuration .sp -Using Salt for Digital Ocean requires a client_key and an api_key. These can be -found in the Digital Ocean web interface, in the "My Settings" section, under +Using Salt for DigitalOcean requires a client_key and an api_key. These can be +found in the DigitalOcean web interface, in the "My Settings" section, under the API Access tab. .INDENT 0.0 .INDENT 3.5 @@ -14841,7 +14841,7 @@ my\-digitalocean\-config: \fBNOTE:\fP .INDENT 0.0 .INDENT 3.5 -Additional documentation is available from \fI\%Digital Ocean\fP\&. +Additional documentation is available from \fI\%DigitalOcean\fP\&. .UNINDENT .UNINDENT .SS Feature Matrix @@ -19442,7 +19442,7 @@ providers. .IP \(bu 2 \fBGetting Started With Azure\fP .IP \(bu 2 -\fBGetting Started With Digital Ocean\fP +\fBGetting Started With DigitalOcean\fP .IP \(bu 2 \fBGetting Started With EC2\fP .IP \(bu 2 @@ -88619,7 +88619,7 @@ _ T{ \fBdigital_ocean\fP T} T{ -Digital Ocean Cloud Module +DigitalOcean Cloud Module T} _ T{ @@ -88909,9 +88909,9 @@ Return the script deployment object Show the details from the provider concerning an instance .UNINDENT .SS salt.cloud.clouds.digital_ocean -.SS Digital Ocean Cloud Module +.SS DigitalOcean Cloud Module .sp -The Digital Ocean cloud module is used to control access to the Digital Ocean +The DigitalOcean cloud module is used to control access to the DigitalOcean VPS system. .sp Use of this module only requires the \fBapi_key\fP parameter to be set. Set up the @@ -88923,7 +88923,7 @@ cloud configuration at \fB/etc/salt/cloud.providers\fP or .nf .ft C my\-digital\-ocean\-config: - # Digital Ocean account keys + # DigitalOcean account keys client_key: wFGEwgregeqw3435gDger api_key: GDE43t43REGTrkilg43934t34qT43t4dgegerGEgg provider: digital_ocean @@ -89023,7 +89023,7 @@ Return a list of the VMs that are on the provider, with select fields .INDENT 0.0 .TP .B salt.cloud.clouds.digital_ocean.query(method=\(aqdroplets\(aq, droplet_id=None, command=None, args=None) -Make a web call to Digital Ocean +Make a web call to DigitalOcean .UNINDENT .INDENT 0.0 .TP @@ -89033,7 +89033,7 @@ Return the script deployment object .INDENT 0.0 .TP .B salt.cloud.clouds.digital_ocean.show_instance(name, call=None) -Show the details from Digital Ocean concerning a droplet +Show the details from DigitalOcean concerning a droplet .UNINDENT .INDENT 0.0 .TP diff --git a/doc/topics/cloud/cloud.rst b/doc/topics/cloud/cloud.rst index 772e599100..f5256517ab 100644 --- a/doc/topics/cloud/cloud.rst +++ b/doc/topics/cloud/cloud.rst @@ -172,7 +172,7 @@ required by the developer. When this is the case, some or all of the functions in ``libcloudfuncs`` may be replaced. If they are all replaced, the libcloud imports should be absent from the Salt Cloud module. -A good example of a non-libcloud provider is the Digital Ocean module: +A good example of a non-libcloud provider is the DigitalOcean module: https://github.com/saltstack/salt/tree/develop/salt/cloud/clouds/digital_ocean.py diff --git a/doc/topics/cloud/config.rst b/doc/topics/cloud/config.rst index 3a98a47e15..35ae13aa5d 100644 --- a/doc/topics/cloud/config.rst +++ b/doc/topics/cloud/config.rst @@ -551,11 +551,11 @@ For in-house OpenStack Essex installation, libcloud needs the service_type : -Digital Ocean +DigitalOcean ------------- -Using Salt for Digital Ocean requires a client_key and an api_key. These can be -found in the Digital Ocean web interface, in the "My Settings" section, under +Using Salt for DigitalOcean requires a client_key and an api_key. These can be +found in the DigitalOcean web interface, in the "My Settings" section, under the API Access tab. * Using the old format: diff --git a/doc/topics/cloud/digitalocean.rst b/doc/topics/cloud/digitalocean.rst index 173858ca00..5d68a9f8e8 100644 --- a/doc/topics/cloud/digitalocean.rst +++ b/doc/topics/cloud/digitalocean.rst @@ -1,8 +1,8 @@ ================================== -Getting Started With Digital Ocean +Getting Started With DigitalOcean ================================== -Digital Ocean is a public cloud provider that specializes in Linux instances. +DigitalOcean is a public cloud provider that specializes in Linux instances. Dependencies @@ -12,7 +12,7 @@ This driver requires the Python ``requests`` library to be installed. Configuration ============= -Using Salt for Digital Ocean requires a client_key, an api_key, an ssh_key_file, +Using Salt for DigitalOcean requires a client_key, an api_key, an ssh_key_file, and an ssh_key_name. The client_key and api_key can be found in the Digital Ocean web interface, in the "My Settings" section, under the API Access tab. The ssh_key_name can be found under the "SSH Keys" section. @@ -114,4 +114,4 @@ command: .. note:: - Additional documentation is available from `Digital Ocean `_. + Additional documentation is available from `DigitalOcean `_. diff --git a/doc/topics/cloud/index.rst b/doc/topics/cloud/index.rst index 16e3f46371..5bdc27fb5f 100644 --- a/doc/topics/cloud/index.rst +++ b/doc/topics/cloud/index.rst @@ -46,7 +46,7 @@ Cloud Provider Specifics Getting Started With Aliyun Getting Started With Azure - Getting Started With Digital Ocean + Getting Started With DigitalOcean Getting Started With EC2 Getting Started With GoGrid Getting Started With Google Compute Engine diff --git a/doc/topics/cloud/releases/0.8.7.rst b/doc/topics/cloud/releases/0.8.7.rst index 95847fb1bc..8c9d3ba9db 100644 --- a/doc/topics/cloud/releases/0.8.7.rst +++ b/doc/topics/cloud/releases/0.8.7.rst @@ -15,7 +15,7 @@ their cloud offering: http://xmission.com/cloud_hosting -We would also like to thank Digital Ocean for their help and resources while +We would also like to thank DigitalOcean for their help and resources while developing the driver for their cloud offering. The folks over there have been very friendly and helpful! Please take a moment to check them out: @@ -61,11 +61,11 @@ provider. PARALLELS.url: https://api.cloud.xmission.com:4465/paci/v1.0/ -Added Digital Ocean Support +Added DigitalOcean Support =========================== -Digital Ocean has been a highly-requested cloud provider, and we are pleased to +DigitalOcean has been a highly-requested cloud provider, and we are pleased to be able to meet the demand. Only a ``client_key`` and an ``api_key`` are -required for Digital Ocean. +required for DigitalOcean. * Using the legacy configuration format: diff --git a/doc/topics/development/tests/index.rst b/doc/topics/development/tests/index.rst index e665f122cc..008cdafa0d 100644 --- a/doc/topics/development/tests/index.rst +++ b/doc/topics/development/tests/index.rst @@ -84,8 +84,8 @@ provided in ``tests/integration/files/conf/cloud.providers.d/``. In order to run the cloud provider tests, valid credentials, which differ per provider, must be supplied. Each credential item that must be supplied is indicated by an empty string value and should be edited by the user before running the tests. For -example, Digital Ocean requires a client key and an api key to operate. Therefore, -the default cloud provider configuration file for Digital Ocean looks like this: +example, DigitalOcean requires a client key and an api key to operate. Therefore, +the default cloud provider configuration file for DigitalOcean looks like this: .. code-block:: yaml diff --git a/salt/cloud/clouds/digital_ocean.py b/salt/cloud/clouds/digital_ocean.py index c2c06c025e..0390cf5d45 100644 --- a/salt/cloud/clouds/digital_ocean.py +++ b/salt/cloud/clouds/digital_ocean.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- ''' -Digital Ocean Cloud Module +DigitalOcean Cloud Module ========================== -The Digital Ocean cloud module is used to control access to the Digital Ocean +The DigitalOcean cloud module is used to control access to the DigitalOcean VPS system. Use of this module only requires the ``api_key`` parameter to be set. Set up the @@ -13,7 +13,7 @@ cloud configuration at ``/etc/salt/cloud.providers`` or .. code-block:: yaml my-digital-ocean-config: - # Digital Ocean account keys + # DigitalOcean account keys client_key: wFGEwgregeqw3435gDger api_key: GDE43t43REGTrkilg43934t34qT43t4dgegerGEgg provider: digital_ocean @@ -48,7 +48,7 @@ log = logging.getLogger(__name__) # Only load in this module if the DIGITAL_OCEAN configurations are in place def __virtual__(): ''' - Check for Digital Ocean configurations + Check for DigitalOcean configurations ''' if get_configured_provider() is False: return False @@ -283,7 +283,7 @@ def create(vm_): if key_filename is None: raise SaltCloudConfigError( - 'The Digital Ocean driver requires an ssh_key_file and an ssh_key_name ' + 'The DigitalOcean driver requires an ssh_key_file and an ssh_key_name ' 'because it does not supply a root password upon building the server.' ) @@ -485,7 +485,7 @@ def create(vm_): def query(method='droplets', droplet_id=None, command=None, args=None): ''' - Make a web call to Digital Ocean + Make a web call to DigitalOcean ''' base_path = str(config.get_cloud_config_value( 'api_root', @@ -516,7 +516,7 @@ def query(method='droplets', droplet_id=None, command=None, args=None): request = requests.get(path, params=args) if request.status_code != 200: raise SaltCloudSystemExit( - 'An error occurred while querying Digital Ocean. HTTP Code: {0} ' + 'An error occurred while querying DigitalOcean. HTTP Code: {0} ' 'Error: {1!r}'.format( request.getcode(), #request.read() @@ -554,7 +554,7 @@ def script(vm_): def show_instance(name, call=None): ''' - Show the details from Digital Ocean concerning a droplet + Show the details from DigitalOcean concerning a droplet ''' if call != 'action': raise SaltCloudSystemExit( diff --git a/tests/integration/cloud/providers/digital_ocean.py b/tests/integration/cloud/providers/digital_ocean.py index ff96b35b53..e44658fe0a 100644 --- a/tests/integration/cloud/providers/digital_ocean.py +++ b/tests/integration/cloud/providers/digital_ocean.py @@ -33,7 +33,7 @@ except ImportError: @skipIf(HAS_REQUESTS is False, 'salt-cloud requires python requests library') class DigitalOceanTest(integration.ShellCase): ''' - Integration tests for the Digital Ocean cloud provider in Salt-Cloud + Integration tests for the DigitalOcean cloud provider in Salt-Cloud ''' @expensiveTest @@ -76,7 +76,7 @@ class DigitalOceanTest(integration.ShellCase): def test_instance(self): ''' - Test creating an instance on Digital Ocean + Test creating an instance on DigitalOcean ''' name = 'digitalocean-testing'