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
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
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
twangboy
6635b9003f
Fix winrm powershell script
...
Removes the `Hostname` paramater in the winrm create command. It is not
needed. It must match the hostname on the certificate, which is not
defined in the case of the Remote Desktop certificate
Removes extra spaces
2018-04-12 14:41:19 -06:00
Mike Place
bc66641dd2
Merge branch 'develop' into ec2_image_name
2018-04-05 09:40:49 -05:00
Amir Pakdel
6d649a948d
Added a bit a doc for Amazon EC2 AMI name
2018-04-04 14:59:19 -04:00
Nicole Thomas
92328dc0ed
Merge pull request #46724 from StackPointCloud/reserve_public_ip
...
Reserve public IP block
2018-04-04 09:57:43 -04:00
denza
14671418d8
Merge branch 'develop' of github.com:saltstack/salt into reserve_public_ip
2018-04-02 23:52:40 +02:00
Ethan Devenport
fc67261e65
Merge branch 'develop' into public_private_ip
2018-03-29 11:31:04 -06:00
Nicole Thomas
6fb83b7c83
Merge pull request #46694 from StackPointCloud/volume_password
...
Volume password
2018-03-29 10:10:11 -04:00
denza
01cf2aef62
Merge branch 'develop' of github.com:saltstack/salt into reserve_public_ip
2018-03-28 05:41:27 +02:00
denza
377d0c085f
Merge branch 'develop' of github.com:saltstack/salt into public_private_ip
2018-03-28 05:40:18 +02:00
denza
0e52faf8e7
Merge branch 'develop' of github.com:saltstack/salt into volume_password
2018-03-28 05:39:27 +02:00
denza
f53e186411
Fixing typo
2018-03-28 05:19:15 +02:00
rallytime
2c4668a5cb
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/modules/kubernetes.py
- salt/states/netconfig.py
- salt/states/zfs.py
- tests/integration/cloud/providers/test_profitbricks.py
- tests/integration/scheduler/test_eval.py
- tests/unit/grains/test_core.py
- tests/unit/test_pillar.py
2018-03-27 11:57:29 -04:00
denza
37ebb1e419
Adding a version tag
2018-03-26 23:23:51 +02:00
denza
9e582c2240
Adding a version tag
2018-03-26 23:21:42 +02:00
denza
ad9009b1c0
Adding a version tag
2018-03-26 23:19:17 +02:00
Amir Pakdel
2dfaa25e37
Merge branch 'develop' into ec2_image_name
2018-03-26 13:27:26 -04:00
Amir Pakdel
63a74eb2fe
Salt Cloud EC2: Image Name
2018-03-26 13:21:17 -04:00
cwlinode
8b8f9125cd
Update linode.rst
...
Following this page to store profiles in `cloud.profiles.d/`, `salt-cloud -p linode_1024 linode-instance` returns the error below unless the profile is named with a `.conf` file extension.
```
[ERROR ] Profile linode_1024 is not defined
Error:
Profile linode_1024 is not defined
```
2018-03-26 11:33:16 -04:00
denza
c2ad95c7df
Match Profitbricks naming convention
2018-03-26 00:22:31 +02:00
denza
47b5112609
Merge branch 'develop' of github.com:StackPointCloud/salt into reserve_public_ip
2018-03-21 22:45:01 +01:00
denza
fb0aedbff4
Merge branch 'develop' of github.com:StackPointCloud/salt into public_private_ip
2018-03-21 22:43:01 +01:00
denza
76944f60ce
Merge branch 'develop' of github.com:StackPointCloud/salt into volume_password
2018-03-21 22:41:59 +01:00
rallytime
71178940e3
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/states/pip_state.py
- salt/utils/schedule.py
2018-03-16 15:09:16 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- .kitchen.yml
- Gemfile
- pkg/windows/build_env_2.ps1
- pkg/windows/build_env_3.ps1
- pkg/windows/req.txt
- salt/client/ssh/__init__.py
- salt/client/ssh/ssh_py_shim.py
- salt/modules/boto_vpc.py
- salt/modules/file.py
- salt/modules/heat.py
- salt/modules/smartos_vmadm.py
- salt/modules/win_dsc.py
- salt/returners/elasticsearch_return.py
- salt/runners/salt.py
- salt/states/module.py
- salt/utils/win_functions.py
- setup.py
- tests/integration/modules/test_state.py
- tests/unit/grains/test_core.py
- tests/unit/test_pillar.py
2018-03-15 17:22:05 -04:00
rallytime
aa760334a1
Merge branch '2018.3.0rc1' into '2018.3'
...
No conflicts.
2018-03-13 10:58:28 -04:00
rallytime
651dcaff66
Merge branch '2018.3' into 'develop'
...
Conflicts:
- tests/integration/states/test_file.py
2018-03-12 11:53:21 -04:00
nicholasmhughes
f82367289e
added the ability to send salt keys to the userdata script
2018-03-12 09:11:37 -04:00
denza
f1a3d3d8e7
Reserve one or more public IPs
2018-03-11 07:42:54 +01:00
denza
f62aab3bbb
Allow a customer to set public and private IP addresses
2018-03-10 09:31:43 +01:00
Jochen Breuer
58836993dd
Fixed typo
...
I think this should be whether instead of wither.
2018-03-09 10:03:50 +01:00
Benjamin Drung
3d37eca847
Fix various spelling mistakes
...
lintian found various spelling mistakes.
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 19:14:42 +01:00
Benjamin Drung
a3c54b50f6
Fix various spelling mistakes
...
lintian found various spelling mistakes.
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 15:25:42 +01:00
denza
6bfdc0f0dc
Support for a volume password
2018-03-08 05:50:17 +01:00
sumeetisp
c9127712d2
Change in profile parameter as per code
...
In the code, del_all_vols_on_destroy is used and in documentation del_all_vol_on_destroy has been used. Hence there is a mismatch.
2018-03-06 13:15:46 +05:30
Daniel Wallace
ac4133f432
Add getting started openstack doc
2018-03-05 16:25:08 -07:00
Nicole Thomas
5f88d64dc0
Merge pull request #46186 from nicholasmhughes/add-additional-azurearm-modules
...
Add Additional Azure ARM Modules
2018-03-02 16:49:07 -05:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/auth/ldap.py
- salt/modules/zfs.py
- salt/modules/zpool.py
- salt/states/cmd.py
- salt/utils/schedule.py
- tests/integration/scheduler/test_eval.py
- tests/integration/scheduler/test_postpone.py
- tests/unit/grains/test_core.py
2018-03-02 11:55:06 -05:00
