valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
102,172 Commits 24 Branches 182 Tags 341 MiB
a266a5cd7b
Commit Graph

827 Commits

Author SHA1 Message Date
Ch3LL
63962b547a
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/states/linux_acl.py
  - salt/transport/ipc.py
 2019-03-28 11:10:45 -04:00
Megan Wilhite
bda3ca2071
Merge pull request #51749 from terminal-labs/salt-cloud-map-alt-update 
Salt cloud map alt update
 2019-03-28 09:52:26 -04:00
Alan Cugler
9ca0f72308 Changed where to mention the map files compatibility for minion configuration options. 
This is a result of @Ch3LL suggestion on the PR itself for this doc change.
 2019-03-27 12:42:03 -05:00
Alan Cugler
364ef065e8 Added mention of map file alternative for minion configuration options. 
Fixes: #51127
 2019-03-27 12:42:03 -05:00
Alan Cugler
0b1eb00dc4
Replaced test.ping with test.version 
Result of issue #52277

Any where `test.ping` still exists in the docs was left
because of the context in those docs.
 2019-03-25 12:09:48 -05:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
 2019-02-15 15:09:36 -05:00
Gareth J. Greenaway
a8f42a0d42
Various documentation fixes. 2019-01-31 10:30:57 -08:00
Ch3LL
09dd1cba8d
Update Fluorine references to 2019.2.0 2019-01-08 14:55:42 -05:00
rallytime
b9f61323b5
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-10-22 14:41:20 -04:00
Michael Lustfield
3a62f74758
Add support for setting root ssh pubkey to proxmox containers. 2018-10-20 19:03:40 -05:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
rallytime
1b5b018da2
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/minion.py
  - salt/states/lvm.py
 2018-10-15 13:13:57 -04:00
Joachim Gleissner
e6d86fca91
document GCE instance credentials configuration 2018-10-15 11:02:25 -04:00
rallytime
f46d4e0a26
[develop] Fluorine deprecations in cloud util (and related functions) 
Since `Fluorine` was misspelled in a couple of places and subsequently fixed,
the removal of the `cache_nodes_ip` function was missed.

This PR removes the deprecated `cache_nodes_ip` function from salt.utils.cloud.

This PR also updates some of the warn_util versions to match the removal/support
warning message. The `warn_util` version was set to `Fluorine`, but the "will be
removed in version" message stated Sodium. Sodium is the correct version, so the
docs and warn_util versions have been corrected.
 2018-07-30 11:46:13 -04:00
Paul Bruno
0d4ad6eac1 improve document example 2018-07-24 16:31:08 -04:00
Paul Bruno
faa57c76a8 make recommended changes, update documentation 2018-07-24 16:27:46 -04:00
Marc-Aurèle Brothier
54fa5f231e
cloudstack: fix wrong attribute name in doc 2018-07-23 15:55:54 +02:00
Renat Zaripov
6b69f196f8 Little fix in Vagrant cloud topic 2018-07-11 18:10:41 +03:00
Christophe Vedel
b274ab78a7 support RunOnce in the VMware salt-cloud driver 2018-07-05 22:27:05 +02:00
Paul Bruno
aeb4e7ffe0 remove whitespace 2018-06-26 11:33:50 -04:00
Paul Bruno
916c59dddb update documentation for aws ec2 spot instance rerequest tagging support 2018-06-26 11:29:48 -04:00
Evan Mattiza
49c5651280
Remove Azure <1.0 Old Dependency Change Note 
I understand there was a period where pyazure 1.0 was not working with salt per #27980 and seeing as this was resolved with newer versions, the note is no longer relevant.
 2018-06-15 15:05:05 -05:00
Daniel Wallace
611ea92b8b
Merge branch 'develop' into aws_provider_with_role_arn_support 2018-06-13 08:47:55 -05:00
Ky-Anh Huynh
a9663588bf
cloud/aws: add notes for role_arn setting in provider configuration 2018-06-11 22:12:04 +07:00
nicholasmhughes
4845e02b30
fixes #48019 add ability to pass image resource ID for vm creation 2018-06-10 22:41:32 -04:00
Erik Johnson
04a80673a2
Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
rallytime
7dc1e770c4
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/topics/installation/freebsd.rst
  - salt/cloud/clouds/oneandone.py
  - salt/grains/core.py
  - salt/modules/napalm_ntp.py
  - salt/modules/win_update.py
  - salt/modules/win_wua.py
  - salt/modules/zabbix.py
  - salt/renderers/pass.py
  - salt/states/vault.py
  - tests/unit/states/test_win_update.py
 2018-06-06 13:35:36 -04:00
Erik Johnson
f89d2ccd30
Clean up Sphinx warnings 2018-06-06 08:42:21 -05:00
nicholasmhughes
10571469bc
fixes #47819 in order to better explain the volumes parameter 2018-06-03 16:57:31 -04:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Nicole Thomas
f4288a8616
Merge pull request #47869 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-30 09:44:15 -04:00
Daniel Wallace
cf1e5d4c25
Merge pull request #47742 from nickgarber/develop__wip-issue-40975-read-salt-cloud-maps-from-the-pillar 
[WIP] feat: read Salt-Cloud Maps from the Pillar
 2018-05-29 12:37:48 -05:00
rallytime
d9096653f7
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/__init__.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/support/paths.py
 2018-05-29 11:28:06 -04:00
Nick Garber
75eb4d13b0
Merge branch 'develop' into develop__wip-issue-40975-read-salt-cloud-maps-from-the-pillar 2018-05-25 11:23:26 -04:00
nicholasmhughes
af16e50856
fixes #47794 where network_resource_group doesn't behave properly 2018-05-25 10:05:50 -04:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04:00
Renat Zaripov
cf4669be8d Deleting duplicate description for SSH Port option in salt-cloud miscellaneous options topic 2018-05-23 15:36:29 +03:00
Nick Garber
859efe3fbd Issue #40975 
- The function signature `def map_run(path=None, **kwargs):`, so
   doesn't need to change.
 - Adding support for Cloud Maps in Pillar builds on the strength of the
   dynamic pillar-centric data organizing scheme.
 - in `Map.__init__`, a file path is read in as the class's
   `self.rendered_map` by the `Map.read` function, (which locates the file
   using the file path that the CloudClient is where most of the
   functionality is collected and it gets a copy of pillar values
   here (https://github.com/saltstack/salt/blob/develop/salt/cloud/init.py#L194-L206).

(doc)
 - added usage and precedence info to `map_run()` at modules/cloud.py
 - added example pillar to topics/cloud/config.rst
 - corrected YAML indentation of example 7 in topics/cloud/map.rst
 2018-05-22 17:45:39 -04:00
rallytime
a90c1b760e
Update cloud test profile and docs to use new Linode size lables 
Linode changed their size labels recently, so the cloud test profile
and the docs need to be updated accordingly.

The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`.

For example, the `Linode 2048` size is now `Linode 2GB`.
 2018-05-22 16:00:39 -04:00
rallytime
969296ecbe
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-05-15 12:38:01 -04:00
rallytime
ca927fc14b
Add extra lines that are needed for proper code-block formatting 2018-05-09 16:10:31 -04:00
Daniel Wozniak
439806b2bb
Merge branch 'develop' into pypsexec 2018-05-04 09:57:44 -07:00
Johan Ryberg
11856adea2
Changed to cloud_provider 
Changed incorrect parameter provider to cloud_provider
 2018-05-03 10:20:37 +02:00
Daniel A. Wozniak
0816668975
clean up mis-spellings 2018-04-30 08:52:49 -07:00
esell
b2725f9858
add allocate_public_ip to docs 2018-04-30 09:29:51 -06:00
Daniel A. Wozniak
86e25cf4f1
Add support for pypsexec and smbprotocol 
- Removes the need for winexe which is not packaged for all platforms we
  support. The replacement, pypsexec, is pure python so it will work
  everywhere.
- Add support for smbprotocol to be used instead of impacket.
  smbprotocol supports python 3 and is also used by pypsexec.
 2018-04-29 00:36:27 -07:00
Amel Ajdinovic
615866032b Added create block storage support. 
Added ssh key support.

Added documentation
 2018-04-23 23:16:36 +02:00
rallytime
0eab957281
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_git.py
  - tests/unit/modules/test_tls.py
 2018-04-20 15:40:49 -04:00
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/test_minion.py
 2018-04-17 10:54:42 -04:00