From e673236bbd3fb824c87cdd05c469e3aca832c643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= <ramon.tomas84@hotmail.com>
Date: Fri, 15 Sep 2017 16:50:10 +0200
Subject: [PATCH] Added Reverse Proxy LB Rule to ARM template

---
 .../ApplicationManifest.xml                   |  5 ++++-
 .../ApplicationParameters/Cloud.xml           |  3 ++-
 .../WebMVCPkg/ServiceManifest.xml             |  1 +
 .../servicefabricdeploy.json                  | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
index 6c745499d..0d3e54d46 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
@@ -19,6 +19,7 @@
     <Parameter Name="CatalogApi_InstanceCount" DefaultValue="-1" />
     <Parameter Name="BasketApi_InstanceCount" DefaultValue="-1" />
     <Parameter Name="IdentityUrlExternal" DefaultValue="" />
+    <Parameter Name="PicBaseUrl" DefaultValue="" />
   </Parameters>
   <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
        should match the Name and Version attributes of the ServiceManifest element defined in the 
@@ -104,7 +105,9 @@
   </ServiceManifestImport>
   <ServiceManifestImport>
     <ServiceManifestRef ServiceManifestName="CatalogApiPkg" ServiceManifestVersion="1.0.0" />
-    <ConfigOverrides />
+    <EnvironmentOverrides CodePackageRef="Code">
+      <EnvironmentVariable Name="PicBaseUrl" Value="[PicBaseUrl]"/>
+    </EnvironmentOverrides>
     <Policies>
       <ContainerHostPolicies CodePackageRef="Code">
         <PortBinding ContainerPort="80" EndpointRef="CatalogApiTypeEndpoint"/>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
index d250e1eea..b58cd8a2e 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
@@ -13,5 +13,6 @@
     <Parameter Name="CatalogApi_InstanceCount" Value="-1" />
     <Parameter Name="BasketApi_InstanceCount" Value="-1" />
     <Parameter Name="IdentityUrlExternal" Value="http://your_sf_dns:5105" />
+    <Parameter Name="PicBaseUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/" />
   </Parameters>
-</Application>
\ No newline at end of file
+</Application>
diff --git a/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
index 82f2efa0d..dbb6d3475 100644
--- a/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
@@ -27,6 +27,7 @@
       <EnvironmentVariable Name="BasketUrl" Value="http://basketapi.eshoponservicefabric:5103"/>
       <EnvironmentVariable Name="IdentityUrl" Value=""/>
       <EnvironmentVariable Name="MarketingUrl" Value="http://marketingapi.eshoponservicefabric:5110"/>
+      <EnvironmentVariable Name="LocationsUrl" Value="http://locationsapi.eshoponservicefabric:5109"/>
     </EnvironmentVariables>
   </CodePackage>
 
diff --git a/deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.json b/deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.json
index 7534d7d4e..b3fe4b59d 100644
--- a/deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.json
+++ b/deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.json
@@ -367,6 +367,25 @@
                             "protocol": "tcp"
                         }
                     },
+                    {
+                        "name": "ReverseProxyHttpRule",
+                        "properties": {
+                            "backendAddressPool": {
+                                "id": "[variables('lbPoolID0')]"
+                            },
+                            "backendPort": "[parameters('nt0reverseProxyEndpointPort')]",
+                            "enableFloatingIP": "false",
+                            "frontendIPConfiguration": {
+                                "id": "[variables('lbIPConfig0')]"
+                            },
+                            "frontendPort": "[parameters('nt0reverseProxyEndpointPort')]",
+                            "idleTimeoutInMinutes": "5",
+                            "probe": {
+                                "id": "[variables('lbHttpProbeID0')]"
+                            },
+                            "protocol": "tcp"
+                        }
+                    },
                     {
                         "name": "WebMVCHttpRule",
                         "properties": {