valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace all occurrences of "Digital Ocean" with "DigitalOcean"

Browse Source
This commit is contained in:
Kamal Nasser 2014-08-08 22:16:37 +03:00 committed by Colton Myers
parent 98b8c28c1e
commit c613c08869
9 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
doc/man/salt.7
View File

@ -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

2
doc/topics/cloud/cloud.rst
View File

@ -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

6
doc/topics/cloud/config.rst
View File

@ -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:

8
doc/topics/cloud/digitalocean.rst
View File

@ -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 <https://www.digitalocean.com/community/articles/automated-provisioning-of-digitalocean-cloud-servers-with-salt-cloud-on-ubuntu-12-04>`_.
Additional documentation is available from `DigitalOcean <https://www.digitalocean.com/community/articles/automated-provisioning-of-digitalocean-cloud-servers-with-salt-cloud-on-ubuntu-12-04>`_.

2
doc/topics/cloud/index.rst
View File

@ -46,7 +46,7 @@ Cloud Provider Specifics
Getting Started With Aliyun <aliyun>
Getting Started With Azure <azure>
Getting Started With Digital Ocean <digitalocean>
Getting Started With DigitalOcean <digitalocean>
Getting Started With EC2 <aws>
Getting Started With GoGrid <gogrid>
Getting Started With Google Compute Engine <gce>

8
doc/topics/cloud/releases/0.8.7.rst
View File

@ -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:

4
doc/topics/development/tests/index.rst
View File

@ -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

16
salt/cloud/clouds/digital_ocean.py
View File

@ -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(

4
tests/integration/cloud/providers/digital_ocean.py
View File

@ -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'