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

Merge pull request #10290 from techhat/rackspace

Browse Source 
Make rackspace vs openstack distinction clearer, refs #10286
This commit is contained in:
Pedro Algarvio 2014-02-08 18:13:51 +00:00
commit 887a7f2d47
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,9 +5,11 @@ Getting Started With Rackspace
Rackspace is a major public cloud platform which may be configured using either
the `rackspace` or the `openstack` driver, depending on your needs.
Please note that the `rackspace` driver is only intended for "the old cloud" at
Rackspace. Unless you explicitly have a reason to use it, it is highly
recommended that you use the `openstack` driver instead.
Please note that the `rackspace` driver is only intended for 1st gen instances,
aka, "the old cloud" at Rackspace. It is required for 1st gen instances, but
will *not* work with OpenStack-based instances. Unless you explicitly have a
reason to use it, it is highly recommended that you use the `openstack` driver
instead.
To use the `openstack` driver (recommended), set up the cloud configuration at
``/etc/salt/cloud.providers`` or

6
salt/cloud/clouds/rackspace.py
View File

@ -7,6 +7,12 @@ The Rackspace cloud module. This module uses the preferred means to set up a
libcloud based cloud module and should be used as the general template for
setting up additional libcloud based modules.
Please note that the `rackspace` driver is only intended for 1st gen instances,
aka, "the old cloud" at Rackspace. It is required for 1st gen instances, but
will *not* work with OpenStack-based instances. Unless you explicitly have a
reason to use it, it is highly recommended that you use the `openstack` driver
instead.
The rackspace cloud module interfaces with the Rackspace public cloud service
and requires that two configuration parameters be set for use, ``user`` and
``apikey``.