Merge "Moved elastic apps to OS::Neutron::LoadBalancer"

muranorepository/Services/heat_templates/Linux.template

@@ -3,7 +3,7 @@
 
     "Parameters": {
         "KeyName": {
-            "Description": "Key Pair name for Load Balancer",
+            "Description": "Key Pair",
             "Type": "String",
             "Default": "$keyName"
         }

muranorepository/Services/heat_templates/LoadBalancer.template

@@ -1,22 +1,39 @@
 {
-     "Resources" : {
+    "Resources": {
-         "$lbName" : {
+        "${lbName}-HealthMonitor": {
-             "Type" : "AWS::ElasticLoadBalancing::LoadBalancer",
+            "Type": "OS::Neutron::HealthMonitor",
-             "Properties" : {
+            "Properties": {
-                "AvailabilityZones" : { "Fn::GetAZs" : "" },
+                "type": "HTTP",
-                "Instances" : [{"Ref": "$instanceName"}],
+                "delay": 3,
-                "Listeners" : [ {
+                "max_retries": 3,
-                    "LoadBalancerPort" : "$lbPort",
+                "timeout": 10,
-                    "InstancePort" : "80",
+                "http_method": "GET",
-                    "Protocol" : "HTTP"
+                "expected_codes": "200",
-                }]
+                "url_path": "/"
-            }
             }
         },
-     "Outputs": {
+        "${lbName}-Pool": {
-        "LoadBalancerIP": {
+            "Type": "OS::Neutron::Pool",
-            "Value": { "Fn::GetAtt": [ "$lbName", "DNSName" ] },
+            "Properties": {
-            "Description": ""
+                "protocol": "HTTP",
+                "subnet_id": {"Ref": "subnet"},
+                "lb_method": "ROUND_ROBIN",
+                "name": "${lbName}-Pool",
+                "vip": {
+                    "name": "${lbName}-Pool-VIP",
+                    "address": "$lbIp",
+                    "protocol_port": "$lbPort"
+                },
+                "monitors": [{"Ref": "${lbName}-HealthMonitor"}]
+            }
+        },
+        "${lbName}-LoadBalancer": {
+            "Type": "OS::Neutron::LoadBalancer",
+            "Properties": {
+                "pool_id": {"Ref": "${lbName}-Pool"},
+                "protocol_port": "$lbPort",
+                "members": [{"Ref": "$instanceName"}]
+            }
         }
     }
 }

muranorepository/Services/heat_templates/Windows.template

@@ -1,13 +1,7 @@
 {
     "AWSTemplateFormatVersion": "2010-09-09",
 
-    "Parameters": {
+    "Parameters": {},
-        "KeyName": {
-            "Description": "Key Pair name for Load Balancer",
-            "Type": "String",
-            "Default": "murano-lb-key"
-        }
-    },
 
     "Resources": {
         "$instanceName": {

muranorepository/Services/ui_forms/AspNetAppFarm.yaml

@@ -66,6 +66,11 @@ forms:
           maxValue: 100
           initial: 2
           helpText: Enter an integer value between 2 and 100
+        - name: loadBalancerIp
+          type: clusterip
+          label: Load Balancer VIP
+          description: Specify IP number where Load Balancer will be running
+          helpText: Enter an free IP address from the subnet where instances will be created
         - name: loadBalancerPort
           type: integer
           label: Load Balancer port

muranorepository/Services/ui_forms/WebServerFarm.yaml

@@ -54,6 +54,11 @@ forms:
           label: Instance Count
           description: Several instances with IIS Service can be created at one time.
           helpText: Enter an integer value between 2 and 100
+        - name: loadBalancerIp
+          type: clusterip
+          label: Load Balancer VIP
+          description: Specify IP number where Load Balancer will be running
+          helpText: Enter an free IP address from the subnet where instances will be created
         - name: loadBalancerPort
           type: integer
           label: Load Balancer port

muranorepository/Services/workflows/WebApps.xml

@@ -53,13 +53,14 @@
 			<parameter name="mappings">
 				<map>
 					<mapping name="instanceName"><select path="state.hostname"/></mapping>
+					<mapping name="lbIp"><select path="::loadBalancerIp"/></mapping>
 					<mapping name="lbPort"><select path="::loadBalancerPort"/></mapping>
 					<mapping name="lbName"><select path="::name"/></mapping>
 				</map>
 			</parameter>
 			<success>
 				<set path="temp.registeredWithLB"><true/></set>
-				<set path="::uri">http://<select source="outputs" path="LoadBalancerIP"/>:<select path="::loadBalancerPort"/></set>
+				<set path="::uri">http://<select path="::loadBalancerIp"/>:<select path="::loadBalancerPort"/></set>
 			</success>
             <failure>
                <report entity="unit" level="error">