Merge "Added Active Directory security rules"

This commit is contained in:
Jenkins 2013-12-10 10:28:07 +00:00 committed by Gerrit Code Review
commit f42661ddef
3 changed files with 19 additions and 0 deletions

View File

@ -21,6 +21,7 @@ heat:
- NNSecurity.template
- DefaultSecurity.template
- WindowsSecurity.template
- DomainSecurity.template
scripts:
- Install-RoleSecondaryDomainController.ps1
- Install-RolePrimaryDomainController.ps1

View File

@ -0,0 +1,17 @@
{
"Resources": {
"$MuranoSecurityGroup-{envName}": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": "53",
"IpProtocol": "tcp",
"FromPort": "53",
"CidrIp": "$cidr"
}
]
}
}
}
}

View File

@ -10,6 +10,7 @@
<rule match="$.services[?(@.type == 'activeDirectory' and not @.securityTemplates)]">
<set path="securityTemplates">
<list>
<text>DomainSecurity</text>
<text>WindowsSecurity</text>
</list>
</set>