saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #47755 from dwoz/winrmtests

Browse source 
Be explicit about winrm setting
This commit is contained in:
Daniel Wozniak 2018-05-21 15:39:23 -07:00 • committed by GitHub
commit 5cd18b9e70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/cloud/providers/test_ec2.py
View file

@ -252,6 +252,7 @@ class EC2Test(ShellCase):
'userdata_file': self.copy_file('windows-firewall.ps1'),
'win_installer': self.copy_file(self.INSTALLER),
'winrm_ssl_verify': False,
'use_winrm': True,
}
)
@ -287,6 +288,7 @@ class EC2Test(ShellCase):
'userdata_file': self.copy_file('windows-firewall.ps1'),
'win_installer': self.copy_file(self.INSTALLER),
'winrm_ssl_verify': False,
'use_winrm': True,
}
)

2
tests/integration/files/conf/cloud.profiles.d/ec2.conf
View file

@ -1,7 +1,7 @@
ec2-test:
provider: ec2-config
image: ami-98aa1cf0
size: t1.micro
size: m1.small
sh_username: ec2-user
script_args: '-P -Z'
ec2-win2012r2-test: