valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,909 Commits 24 Branches 182 Tags 341 MiB
91b5dc7048
Commit Graph

480 Commits

Author SHA1 Message Date
Trevor Hammond
48e0edd0d2 Fixes #29187 - using winrm on EC2 2015-11-25 18:36:45 +00:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Bogdan Radulescu
4a7eee08a8 Documented import_keypair for the ec2 driver 2015-11-23 09:00:51 -07:00
Mathieu Le Marec - Pasquet
a4d197821a LXC: doc 2015-11-18 13:34:56 +01:00
Mathieu Le Marec - Pasquet
43fb0eff02 lxc: remove useless and error prone uses_systemd knob 2015-11-18 13:34:53 +01:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -07:00
Nitin Madhok
9294ebd984 Provide ability to enable/disable customization for new VMs. Fixes #28429 2015-11-11 15:43:36 -05:00
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -07:00
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07:00
Aditya Kulkarni
f4c297e794 Make sure versionchanged is correct 2015-11-06 10:38:48 -05:00
Mike Place
35dbca24e7 Merge pull request #28610 from pass-by-value/lxc_config_additions 
Lxc config additions
 2015-11-05 11:43:05 -07:00
Aditya Kulkarni
83193641ca Add doc about cloud lxc options 2015-11-05 12:15:30 -05:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Benjamin Drung
5843c7aa24 Fix typo an optionnal -> optional 2015-11-04 10:59:22 +01:00
Benjamin Drung
730d0f95e7 Fix typo an transfered -> transferred 2015-11-04 10:59:22 +01:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
SaltyCharles
25883d5c55 Update proxmox.rst 
fix additional typo's
 2015-10-29 13:45:02 -06:00
rallytime
8e3a2ba7e7 Add note about azure sdk version to getting started docs 2015-10-29 15:30:37 -04:00
SaltyCharles
a3a9d6d8b3 Update proxmox.rst 
fix typo
 2015-10-28 15:23:57 -07:00
Jeremy McMillan
aef680fd73 Documentation update for DigitalOcean create_dns_record config option 2015-10-23 16:43:12 -04:00
rallytime
8b06ab4335 Add documentation to supply the ssh_username: freebsd config to DO docs 
Fixes #28230
 2015-10-22 15:24:39 -06:00
Colton Myers
b3f3275e0a Merge pull request #28163 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-10-21 16:46:40 -06:00
Mike Place
508e63237b Merge pull request #28090 from Pixcell/develop 
Add clone for qemu
 2015-10-21 07:19:16 -06:00
root
73b8e85a96 Update doc 2015-10-21 05:45:28 -04:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Aditya Kulkarni
bc371c55cd Add clarification to cloud profile doc about host 2015-10-20 15:17:47 -04:00
Bogdan Radulescu
c9e8228f3c Documented import_keypair for the ec2 driver 2015-10-20 12:41:28 +00:00
rallytime
13a9bc9053 Use eipalloc instead of eni in EC2 interface properties example 
Fixes #27815
 2015-10-13 14:46:01 -06:00
Colton Myers
9128e8e7ae Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
    salt/modules/daemontools.py
 2015-10-07 13:14:28 -06:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
 2015-10-07 12:06:12 -06:00
avinassh
bfa0acfbfe Fix a typo 2015-10-05 08:58:51 -06:00
avinassh
e265ba8592 Fix a typo 2015-10-05 19:21:16 +05:30
rallytime
1d727a545d Require Network Helper over entire account 
Also fixed calling some functions so they don't stacktrace.
 2015-10-02 12:30:19 -06:00
rallytime
a20462b9d9 Allow private ips to be used with the linode driver 
Alos updated the docs to include more provider/profile options and how they're used.
 2015-10-02 12:06:05 -06:00
rallytime
8dc047dc18 If external_up is set to None, don't stacktrace, just use the private ip. 2015-10-01 16:37:17 -06:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
 2015-09-29 14:56:41 -06:00
rallytime
39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. 2015-09-25 12:54:25 -06:00
jacobhammons
24e665335d Merge pull request #27399 from multani/fix/docs 
Various documentation fixes
 2015-09-25 09:42:52 -06:00
Jonathan Ballet
79d8ff38ca doc: fixed RST markup on Salt Cloud functions 2015-09-25 10:20:53 +02:00
Jonathan Ballet
fc8a1bc349 doc: remove duplicated Salt Cloud AWS section on Termination Protection 2015-09-25 10:20:53 +02:00
Alexander Backlund
759c8863d1 Merge branch 'vmware-standalone-esxi' of https://github.com/alxbse/salt into vmware-standalone-esxi 
Conflicts:
	doc/topics/cloud/vmware.rst
	salt/cloud/clouds/vmware.py
 2015-09-24 07:22:06 -04:00
Alexander Backlund
5367949e3b Expand documentation on VMware driver to explain more about creating a VM. Add power_on support when creating. 2015-09-23 17:21:29 -04:00
rallytime
2bf566d934 Allow IP-forwarding in GCE driver 
Fixes #21390
 2015-09-23 14:27:55 -06:00
rallytime
484015a7a3 Added version tag for ex_disk_type option 2015-09-23 14:21:17 -06:00
rallytime
a71ebc97b2 Allow use of rst header links by separating options out from yaml example 
Also added docs to use the ex_disk_type option
 2015-09-23 14:21:06 -06:00
rallytime
1d3925bbfb Added version tag for ex_disk_type option 2015-09-23 13:08:18 -06:00
rallytime
f23369300c Allow use of rst header links by separating options out from yaml example 
Also added docs to use the ex_disk_type option
 2015-09-23 13:06:25 -06:00
alex
f418fa7c0e Adds support for creating without cloning VMs. Makes it possible to manage standalone ESXi. 
Fixes saltstack/salt#26902
 2015-09-23 15:06:03 -04:00
Alexander Backlund
be6921954e Adds support for creating VMs without cloning. Makes it possible to manage standalone ESXi. 
Fixes saltstack/salt#26902
 2015-09-23 07:06:25 -04:00
Colton Myers
ec6cd80496 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/ref/auth/all/index.rst
    doc/ref/auth/all/salt.auth.rest.rst
    doc/ref/beacons/all/index.rst
    doc/ref/beacons/all/salt.beacons.ps.rst
    doc/ref/pillar/all/index.rst
    doc/ref/pillar/all/salt.pillar.consul_pillar.rst
    doc/ref/pillar/all/salt.pillar.neutron.rst
    doc/ref/pillar/all/salt.pillar.sql_base.rst
    doc/ref/pillar/all/salt.pillar.sqlite3.rst
    doc/ref/sdb/all/salt.sdb.rest.rst
    salt/modules/rh_ip.py
    salt/utils/http.py
 2015-09-22 15:31:46 -06:00
Colton Myers
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/modules/yumpkg.py
    salt/runners/ssh.py
    salt/states/git.py
    salt/states/http.py
 2015-09-22 15:20:17 -06:00
rallytime
11a0a528a7 Make sure the VM can be deleted if it was created with use_fqdn 2015-09-22 11:45:27 -06:00
rallytime
9dcd11c155 Created a 'use_fqdn' flag to allow softlayer minion to use an FQDN as their minion id 2015-09-22 11:44:39 -06:00
rallytime
9b34542cb0 Filter on 'name', not 'id', when listing images 
And fix doc example of what --list-images looks like
 2015-09-21 14:35:22 -06:00
Ben Hosmer
3ce77db1bc Fix typo in AWS doc config 2015-09-21 09:36:46 -06:00
rallytime
aafb776808 Add support for post_uri in SoftLayer cloud drivers 2015-09-18 16:24:51 -06:00
Justin Findlay
c9255f2bbd Merge pull request #27236 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-18 13:55:49 -06:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Ben Hosmer
5393751332 Fix typo in AWS doc config 2015-09-18 12:21:37 -04:00
rallytime
cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer 2015-09-17 15:07:49 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
rallytime
531b44243d Remove note - incorrect info 2015-09-16 19:30:03 -06:00
rallytime
fe74d203f5 Add the ability to specify multiple disks on the SoftLayer driver 
Refs #19954
 2015-09-16 16:46:02 -06:00
rallytime
a07db909bd Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples 2015-09-16 12:51:47 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
rallytime
cb641f8145 Update softlayer docs for where to find apikey 2015-09-10 16:23:47 -06:00
Nicole Thomas
3e902e86b1 Merge pull request #26987 from rallytime/bp-26966 
Back-port #26966 to 2015.5
 2015-09-09 12:42:51 -06:00
TheBigBear
6a29eac003 URL has changed 
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
 2015-09-09 08:59:19 -06:00
rallytime
0214daad19 Fix a couple of typos in reactor docs 2015-09-08 14:52:38 -06:00
TheBigBear
c1e39a15d7 URL has changed 
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
 2015-09-08 21:21:17 +01:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
 2015-09-01 15:35:21 -06:00
rallytime
d53754f2b7 Update Saltify docs to be more accurate and helpful 2015-08-31 12:02:23 -06:00
rallytime
f8c927f8b7 Add Getting Started with OpenNebula docs to Cloud Provider Specifics 2015-08-21 10:17:51 -06:00
Joseph Hall
44fbd49b33 Merge pull request #26503 from nmadhok/vmware-hardware-version-develop 
VMware cloud driver - Adding ability to specify the virtual hardware version when creating VM
 2015-08-20 08:35:46 -06:00
Nitin Madhok
dca4d601d5 Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:17:22 -04:00
Nitin Madhok
702b55f2ca Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:05:12 -04:00
Colton Myers
c08668ecf1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/fileserver/gitfs.py
    salt/master.py
    salt/pillar/s3.py
 2015-08-18 12:13:05 -06:00
scottjpack
0254a2e90e Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-18 09:22:57 -06:00
scottjpack
ee898d082a Changed t1 -> t2 micro 
t1.micro no longer supports HVM AMIs.  Attempted launch with a t1.micro results in:

[ERROR   ] AWS Response Status Code and Error: [400 400 Client Error: Bad Request] {'Errors': {'Error': {'Message': "Non-Windows instances with a virtualization type of 'hvm' are currently not supported for this instance type.", 'Code': 'InvalidParameterCombination'}}, 'RequestID': 'd8d20595-0a17-42ad-9f9a-41cbd009098d'}
 2015-08-17 21:31:14 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Nicole Thomas
22705c5222 Merge pull request #26143 from nmadhok/vmware-cloud-fixes-2015.8 
VMware cloud driver fixes [forward port from 2015.5 into 2015.8]
 2015-08-10 10:17:59 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs. 
Refs #24797
 2015-08-10 09:20:26 -06:00
Nitin Madhok
a1899b436c Correct provider name in profile example 2015-08-09 11:49:10 -04:00
Nitin Madhok
8899950564 Correct provider name in profile example 2015-08-09 11:48:31 -04:00
Nitin Madhok
194f2b9ba7 Correct provider name in profile example 2015-08-09 11:48:04 -04:00
Nitin Madhok
b699e0cf47 Change all provider references to driver 2015-08-09 11:47:14 -04:00
Nitin Madhok
2e3a14d02c Change all provider references to driver 2015-08-09 11:43:04 -04:00
Nitin Madhok
e132f06a5c Change double quotes to single quotes in provider configuration example 2015-08-09 03:43:53 -04:00
Colton Myers
d8c5dfb33f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-30 16:58:19 -06:00
Nicole Thomas
13c2377e95 Merge pull request #25764 from gtmanfred/2015.8 
allow use of cloudnetworks in ssh_interface
 2015-07-27 20:40:06 -06:00
Daniel Wallace
51859396d4 add a note in the documentation for openstack 
about the cloud networks in ssh_interfaces
 2015-07-27 16:01:35 -05:00
rallytime
4ea41a3b12 Added "Getting Started with OpenNebula" doc 2015-07-27 13:01:47 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
rallytime
35e13eef1d Don't reference driver in older salt versions 2015-07-17 11:00:57 -06:00
rallytime
0f4f560b38 Backport vmware driver to 2015.5 branch 2015-07-17 10:53:42 -06:00
jacobhammons
cd405b440e Merge pull request #25257 from notpeter/SourceDestCheck 
Document SourceDestCheck added in #25242.
 2015-07-09 17:29:48 -06:00