saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24834 from rallytime/bp-24811

Browse source 
Back-port #24811 to 2015.5
This commit is contained in:
Nicole Thomas 2015-06-19 12:43:49 -06:00
commit 2d8148fb4d
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/topics/cloud/gogrid.rst
View file

@ -29,6 +29,14 @@ in the configuration file to enable interfacing with GoGrid:
apikey: asdff7896asdh789
sharedsecret: saltybacon
.. note::
A Note about using Map files with GoGrid:
Due to limitations in the GoGrid API, instances cannot be provisioned in parallel
with the GoGrid driver. Map files will work with GoGrid, but the ``-P``
argument should not be used on maps referencing GoGrid instances.
Profiles
========

6
doc/topics/cloud/map.rst
View file

@ -39,6 +39,12 @@ to create the virtual machines in parallel:
$ salt-cloud -m /path/to/mapfile -P
.. note::
Due to limitations in the GoGrid API, instances cannot be provisioned in parallel
with the GoGrid driver. Map files will work with GoGrid, but the ``-P``
argument should not be used on maps referencing GoGrid instances.
A map file can also be enforced to represent the total state of a cloud
deployment by using the ``--hard`` option. When using the hard option any vms
that exist but are not specified in the map file will be destroyed:

8
salt/cloud/clouds/gogrid.py
View file

@ -23,6 +23,14 @@ Set up the cloud configuration at ``/etc/salt/cloud.providers`` or
provider: gogrid
.. note::
A Note about using Map files with GoGrid:
Due to limitations in the GoGrid API, instances cannot be provisioned in parallel
with the GoGrid driver. Map files will work with GoGrid, but the ``-P``
argument should not be used on maps referencing GoGrid instances.
'''
from __future__ import absolute_import