stackforge-attic/murano-conductor
Code Issues Proposed changes

Merge "Resolved issues with MuranoDefaultSecurityGroups"

Browse Source
This commit is contained in:
Jenkins 2013-09-17 11:09:25 +00:00 committed by Gerrit Code Review
commit 00abce886d
5 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/templates/cf/SQL-security.template
View File

@ -1,6 +1,6 @@
{
"Resources": {
"$instanceName": {
"$instancePort": {
"Properties": {
"SecurityGroups" : [ {"Ref" : "MsSqlSecurityGroup"} ]
}
@ -10,27 +10,27 @@
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": 4022,
"ToPort": "4022",
"IpProtocol": "tcp",
"FromPort": 4022,
"FromPort": "4022",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": 135,
"ToPort": "135",
"IpProtocol": "tcp",
"FromPort": 135,
"FromPort": "135",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": 1433,
"ToPort": "1433",
"IpProtocol": "tcp",
"FromPort": 1433,
"FromPort": "1433",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": 1434,
"ToPort": "1434",
"IpProtocol": "tcp",
"FromPort": 1434,
"FromPort": "1434",
"CidrIp": "0.0.0.0/0"
}
],

30
data/templates/cf/SQLCluster.template
View File

@ -1,20 +1,16 @@
{
"Resources": {
"$instanceName": {
"Properties": {
"SecurityGroups": [
{
"Ref": "MsSqlSecurityGroup"
}
]
}
},
"$instancePort": {
"Properties": {
"allowed_address_pairs": [
{
"ip_address": "$clusterIp"
}
],
"SecurityGroups": [
{
"Ref": "MsSqlSecurityGroup"
}
]
}
},
@ -23,27 +19,27 @@
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": 4022,
"ToPort": "4022",
"IpProtocol": "tcp",
"FromPort": 4022,
"FromPort": "4022",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": 135,
"ToPort": "135",
"IpProtocol": "tcp",
"FromPort": 135,
"FromPort": "135",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": 1433,
"ToPort": "1433",
"IpProtocol": "tcp",
"FromPort": 1433,
"FromPort": "1433",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": 1434,
"ToPort": "1434",
"IpProtocol": "tcp",
"FromPort": 1434,
"FromPort": "1434",
"CidrIp": "0.0.0.0/0"
}
],

22
data/templates/cf/Windows.template
View File

@ -17,11 +17,6 @@
"ImageId": "$imageName",
"AvailabilityZone": "$availabilityZone",
"UserData": "$userData",
"SecurityGroups": [
{
"Ref": "MuranoDefaultSecurityGroup"
}
],
"NetworkInterfaces": [
{
"Ref": "$instancePort"
@ -32,6 +27,11 @@
"$instancePort": {
"Type": "OS::Neutron::Port",
"Properties": {
"security_groups": [
{
"Ref": "MuranoDefaultSecurityGroup"
}
],
"network_id": {
"Ref": "network"
},
@ -49,21 +49,21 @@
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": 3389,
"ToPort": "3389",
"IpProtocol": "tcp",
"FromPort": 3389,
"FromPort": "3389",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": 22,
"ToPort": "22",
"IpProtocol": "tcp",
"FromPort": 22,
"FromPort": "22",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": -1,
"ToPort": "-1",
"IpProtocol": "icmp",
"FromPort": -1,
"FromPort": "-1",
"CidrIp": "0.0.0.0/0"
}
],

1
data/workflows/MsSqlCluster.xml
View File

@ -55,7 +55,6 @@
<update-cf-stack template="SQLCluster" error="exception">
<parameter name="mappings">
<map>
<mapping name="instanceName"><select path="state.hostname"/></mapping>
<mapping name="instancePort">port-<select path="state.hostname"/></mapping>
<mapping name="clusterIp"><select path="::clusterIp"/></mapping>
</map>

2
data/workflows/MsSqlServer.xml
View File

@ -54,7 +54,7 @@
<update-cf-stack template="SQL-security" error="exception">
<parameter name="mappings">
<map>
<mapping name="instanceName"><select path="state.hostname"/></mapping>
<mapping name="instancePort">port-<select path="state.hostname"/></mapping>
</map>
</parameter>
<success>