valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,704 Commits 24 Branches 182 Tags 341 MiB
439806b2bb
Commit Graph

97 Commits

Author SHA1 Message Date
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Markus
820add5551
Added version tag 2017-10-12 20:30:55 +02:00
Markus Wyrsch
911ee5f361
Add option to eagerly scrub the disk 2017-10-12 13:43:27 +02:00
Vasili Syrakis
4fbcc3b318 Added documentation for the annotation 2017-06-09 00:25:10 +10:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-03 10:58:55 -07:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
 2017-02-03 09:48:58 -07:00
Daniel Wallace
da3053ea9b update vmware getting started doc (#39146) 
The IDE entry needs to be a dictionary entry.  Without this, it is seen
as a string.  This is probably done this way so that in the future,
configurations can be added to the IDE device.
 2017-02-03 09:00:00 -07:00
Eric Radman
17fc12175c Try to resolve guest IP if VMware Tools is not installed 
In some cases installation of VMware Tools is not possible. Enable
salt-cloud to bootstrap a minion by using DNS to resolve it's IP.
 2017-01-15 22:42:53 -05:00
rallytime
342a5ac0b8 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-06 10:31:51 -05:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
 2017-01-04 16:54:58 -05:00
David Boucha
4ddbc2ecaa add note about pyVmomi locale workaround (#38536) 2017-01-04 09:24:04 -05:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
rallytime
513058945c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
 2016-12-19 14:58:39 -07:00
rallytime
6e32267d0c Remove ":doc:" references in salt/* files 2016-12-15 14:03:56 -07:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-14 09:19:49 -07:00
Eric Radman
9a60e298bb vmware: optionally allow network interface MAC to be set 
Example profile:

    network:
      Network Adapter 1:
        mac: '00:16:3e:e8:19:0f'
        name: vlan25
        switch_type: standard

This takes effect as soon as the VM is initialized, so PXE-booting can
take advantage of this.
 2016-11-10 19:59:55 -05:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
Aditya Kulkarni
a7e09f9260 Use existing VM's VDD size if not specified in the cloud profile (#37579) 2016-11-10 09:41:11 -07:00
rallytime
2e68da3e52 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-11-07 08:22:17 -07:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-02 11:33:21 -06:00
Aditya Kulkarni
d8b1c9c777 Add handling for full and linked clone 
and commit disk mode additions
 2016-10-31 12:30:49 -04:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
rallytime
190ec32283 Merge branch 'carbon' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-10-26 10:09:26 -06:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon 2016-10-26 14:08:03 +09:00
Aditya Kulkarni
f64ca3c442 Update release notes and version added 2016-10-25 16:16:46 -06:00
Aditya Kulkarni
0a3d266d6b Add ability to specify disk backing mode for VMware cloud profile 2016-10-25 16:15:30 -06:00
C. R. Oldham
edb47231b2 Add support for specifying a datastore for new disks. (#36457) 
* Add support for specifying a datastore for new disks.

* Document validity of a datastore key inside a disk definition.

* Add docs for "datastore" param for disks

* Lint

* Align tests for new calls
 2016-09-22 17:02:30 -06:00
rallytime
514d6012f3 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-20 10:49:36 -06:00
rallytime
2f9c4268f7 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-19 11:21:55 -06:00
Nicole Thomas
acfce59666 Removes extra empty lines in the disk specificity example (#36410) 2016-09-19 11:13:08 -06:00
Aditya Kulkarni
892df0c089 Add ability to specify disk backing mode for VMware cloud profile (#36334) 
* Add ability to specify disk backing mode for VMware cloud profile

* Update release notes and version added
 2016-09-19 11:05:49 -06:00
Aditya Kulkarni
5737b1c409 Update versionadded and release notes (#36352) 2016-09-16 14:33:32 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -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
rallytime
3d5c160b5d Use Carbon instead of Boron for new develop functions/args/kwargs 2016-08-09 16:07:39 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
 2016-04-26 14:42:26 -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
Nicole Thomas
5ea003b387 Add pyvmomi version warning to Getting Started with VMware docs (#32845) 
Fixes #32824
 2016-04-25 16:46:51 -06:00
Nitin Madhok
c5f26fbebb Update vmware.rst 2016-03-22 22:22:31 -04:00
Anand Nevase
a93c7e2ffa change win_organization_name default value to Organization 2016-02-24 17:34:07 +05:30
Anand Nevase
12a0c76448 Updated Windows Fullname and Organization for vmware driver 2016-02-22 18:50:42 +05:30
Anand Nevase
b47799b17b Merge branch 'develop' of https://github.com/saltstack/salt into develop 2016-02-20 01:16:49 +05:30
Anand Nevase
a697c1845c Added windows vm changes as per review comments. 2016-02-20 01:12:47 +05:30
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07: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
Marno van der Molen
76b6b5189c Fix documentation for cores_per_socket 2016-02-10 14:13:32 +01:00
Marno van der Molen
cf70f06ade add support for numCoresPerSocket parameter in vmware driver 2016-02-10 14:09:51 +01: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