From 11ae7076f5a45fa6e42a01697bdf2401f7786ffa Mon Sep 17 00:00:00 2001 From: Joseph Hall Date: Sat, 8 Feb 2014 05:29:32 -0700 Subject: [PATCH] Make rackspace vs openstack distinction clearer, refs #10286 --- doc/topics/cloud/rackspace.rst | 8 +++++--- salt/cloud/clouds/rackspace.py | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/topics/cloud/rackspace.rst b/doc/topics/cloud/rackspace.rst index 559db8a5ab..7bf076499f 100644 --- a/doc/topics/cloud/rackspace.rst +++ b/doc/topics/cloud/rackspace.rst @@ -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 diff --git a/salt/cloud/clouds/rackspace.py b/salt/cloud/clouds/rackspace.py index 137a46abb5..8726d231a3 100644 --- a/salt/cloud/clouds/rackspace.py +++ b/salt/cloud/clouds/rackspace.py @@ -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``.