stackforge-attic/murano-repository
Code Issues Proposed changes

Merge "Nova network support added to workflows"

Browse Source
This commit is contained in:
Jenkins 2013-11-28 10:06:38 +00:00 committed by Gerrit Code Review
commit 5c1dd9bc25
12 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
muranorepository/Services/activeDirectory-manifest.yaml
View File

@ -14,6 +14,7 @@ heat:
- RouterInterface.template
- Windows.template
- Network.template
- NNSecurity.template
- Param.template
- Subnet.template
- InstancePortWSubnet.template

1
muranorepository/Services/aspNetApp-manifest.yaml
View File

@ -23,6 +23,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

1
muranorepository/Services/aspNetAppFarm-manifest.yaml
View File

@ -23,6 +23,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

1
muranorepository/Services/demoService-manifest.yaml
View File

@ -8,6 +8,7 @@ heat:
- Demo.template
- RouterInterface.template
- Network.template
- NNSecurity.template
- Param.template
- Subnet.template
- InstancePortWSubnet.template

13
muranorepository/Services/heat_templates/NNSecurity.template Normal file
View File

@ -0,0 +1,13 @@
{
"Resources": {
"$instanceName": {
"Properties": {
"SecurityGroups": [
{
"Ref": "MuranoDefaultSecurityGroup"
}
]
}
}
}
}

1
muranorepository/Services/linuxApacheService-manifest.yaml
View File

@ -23,6 +23,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

1
muranorepository/Services/linuxTelnetService-manifest.yaml
View File

@ -22,6 +22,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

1
muranorepository/Services/msSqlClusterServer-manifest.yaml
View File

@ -24,6 +24,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

1
muranorepository/Services/msSqlServer-manifest.yaml
View File

@ -24,6 +24,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

1
muranorepository/Services/webServer-manifest.yaml
View File

@ -23,6 +23,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

1
muranorepository/Services/webServerFarm-manifest.yaml
View File

@ -23,6 +23,7 @@ heat:
- InstancePort.template
- InstancePortWSubnet.template
- Network.template
- NNSecurity.template
- Param.template
- RouterInterface.template
- Subnet.template

15
muranorepository/Services/workflows/Networking.xml
View File

@ -37,6 +37,10 @@
</get-default-network-id>
</rule>
<rule match="$[?(@.networking.topology == 'nova' and not @.networking.state.ready_for_cf)]"
desc="Nova topology - skip all neutron actions">
<set path="networking.state.ready_for_cf"><true/></set>
</rule>
<rule match="$[?(@.networking.topology == 'manual' and not @.networking.state.ready_for_cidrs)]"
desc="No topology queries required, ready to query cidrs">
@ -185,6 +189,17 @@
</update-cf-stack>
</rule>
<rule match="$[?(@.networking.state.ready_for_cf and @.networking.topology == 'nova')].services[*].units[?(@.state.hostname and not @.temp.instanceName)]"
desc="Need to define SecGroups for nova topology">
<update-cf-stack template="NNSecurity">
<parameter name="mappings">
<map>
<mapping name="instanceName"><select path="state.hostname"/></mapping>
</map>
</parameter>
</update-cf-stack>
</rule>
<rule match="$[?(@.networking.createNetwork and @.networking.state.ready_for_cf)]">
<rule match="$.services[*].units[?(@.state.hostname and not @.temp.instanceName)]"
desc="Units to be created requiring ports in new network">