valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,601 Commits 24 Branches 182 Tags 341 MiB
288f437d5e
Commit Graph

504 Commits

Author SHA1 Message Date
Aditya Kulkarni
5737b1c409 Update versionadded and release notes (#36352) 2016-09-16 14:33:32 -06:00
Aditya Kulkarni
d96981639b Add ability to clone from a snapshot to salt-cloud vmware driver 2016-09-12 14:49:20 -04:00
Nicole Thomas
95591c2fe6 Add documentation about salt_interface to EC2 docs (#36015) 
Fixes #35618
 2016-09-02 14:37:04 -06:00
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
rallytime
ead3eb1606 Update azure lib dep to match the one in cloud.clouds.msazure 
Refs #27980
 2016-07-18 11:26:36 -06:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
rallytime
92e0c17645 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-05-09 13:55:06 -06:00
Megan Wilhite
20c7e10793 clarify docs that map is designed to be run once. is not stateful (#33102) 2016-05-06 15:53:31 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/archive.py
 2016-04-28 14:22:58 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
 2016-04-26 12:07:42 -06:00
rallytime
0e73daa126 Use correct config setting in cloud syndic docs 
Fixes #32861
 2016-04-26 11:32:01 -06:00
Nicole Thomas
5ea003b387 Add pyvmomi version warning to Getting Started with VMware docs (#32845) 
Fixes #32824
 2016-04-25 16:46:51 -06:00
Andreas Lutro
3b81031d5b various improvements on cloud deploy script docs (#32659) 2016-04-25 14:00:24 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
 2016-04-11 14:33:21 -06:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
 2016-04-07 16:10:32 -06:00
Mike Place
62389d1d1a Update proxmox documentation 2016-04-05 16:24:26 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 10:56:25 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
Josh Fraser
26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-21 09:08:21 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
Sandor Zeestraten
a1a2229405 Adds missing docs for Azure cloud profile 
Adds documentation for feature introduced in #24559 in salt-cloud
to specify virtual network and subnet in the Azure cloud profile.
 2016-03-13 14:27:49 +01:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
 2016-03-10 13:13:35 -07:00
Jacob Hammons
209c641a41 Made udpates as suggested by @rallytime 2016-03-09 11:00:27 -07:00
Jacob Hammons
26d4991cb3 moved previous intro to new quick start topic (topics/cloud/qs.rst) 
added new intro that explains the salt cloud configuration files
added an inheritance and minion startup state example to topics/cloud/config.rst
 2016-03-07 16:06:16 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Denys Havrysh
f7beeb69f2 Correct Salt Cloud documentation about updating Salt Bootstrap script 2016-02-27 22:43:07 +02:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
Nicole Thomas
6ad59e78c5 Merge pull request #30767 from tonybaloney/feature/dimension_data_cloud 
Add saltcloud module for Dimension Data Cloud
 2016-02-02 08:55:34 -07:00
anthony-shaw
a61e7fbef3 Documentation for the driver 2016-02-02 14:20:08 +11:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
Colton Myers
967e862027 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/loader.py
    salt/modules/npm.py
    salt/pillar/__init__.py
 2016-01-29 15:51:52 -07:00
Clark Perkins
bfec052e7d Added some extra documentation 2016-01-27 11:45:22 -06:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Nicole Thomas
05349071dc Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider 
Adds cloud provider support for ProfitBricks
 2016-01-25 11:28:41 -07:00
Ethan Devenport
de7d1666f6 Updates made after PR review: 
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
 2016-01-25 18:02:10 +00:00
Jonathan Ballet
276eb3a843 Fix GCE documentation 2016-01-25 12:19:21 +01:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00:00
rallytime
d26ed74bde Make sure the correct profile parameters are being checked when cloning 2016-01-21 10:29:48 -07:00
rallytime
1d7e229377 Fix Linode driver cloning functionality. 
Fixes #30432
Fixes #30444

- Various clean-up of the driver, particularly in the create function.
- Restores cloning functionality, as this was completely broken in 2015.8.3
- Changes the requirement to set a config_id for cloned VMs (not necessary
for clones as the config_id is already set via the to-be-cloned profile)
- Updates docs to use the -F bootstrap script arg in addition to -C when
cloning from a VM that already has salt installed on it.
 2016-01-20 17:05:20 -07:00
Jacob Hammons
2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
rallytime
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
 2016-01-07 16:36:40 -07:00
Jacob Hammons
0d2111d397 Assorted doc bug fixes 
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
 2016-01-07 14:08:30 -07:00