Merge "Nova network support added to workflows"

muranorepository/Services/activeDirectory-manifest.yaml

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

muranorepository/Services/aspNetApp-manifest.yaml

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

muranorepository/Services/aspNetAppFarm-manifest.yaml

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

muranorepository/Services/demoService-manifest.yaml

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

muranorepository/Services/heat_templates/NNSecurity.template

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

muranorepository/Services/linuxApacheService-manifest.yaml

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

muranorepository/Services/linuxTelnetService-manifest.yaml

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

muranorepository/Services/msSqlClusterServer-manifest.yaml

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

muranorepository/Services/msSqlServer-manifest.yaml

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

muranorepository/Services/webServer-manifest.yaml

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

muranorepository/Services/webServerFarm-manifest.yaml

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

muranorepository/Services/workflows/Networking.xml

@@ -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">