Fix conflicts during SXP MA role deployment

Fix Azure Service Bus deployment issue (HTTP error 429)
Sitecore · Jan 29, 2020 · cefdc54 · cefdc54
1 parent 3ff33be
commit cefdc54
Show file tree

Hide file tree

Showing 18 changed files with 93 additions and 71 deletions.
diff --git a/Sitecore 9.0.0/XDB/nested/application-ma.json b/Sitecore 9.0.0/XDB/nested/application-ma.json
@@ -242,7 +242,10 @@
           "XConnect Server Instance Name": "MarketingAutomationReporting",
           "License Xml": "[parameters('licenseXml')]"
         }
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maOpsWebAppNameTidy'), '/', 'appsettings')]",

diff --git a/Sitecore 9.0.0/XP/nested/application-ma.json b/Sitecore 9.0.0/XP/nested/application-ma.json
@@ -242,7 +242,10 @@
           "XConnect Server Instance Name": "MarketingAutomationReporting",
           "License Xml": "[parameters('licenseXml')]"
         }
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maOpsWebAppNameTidy'), '/', 'appsettings')]",
@@ -252,7 +255,7 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0
       },
-        "dependsOn": [
+      "dependsOn": [
         "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },

diff --git a/Sitecore 9.0.1/XDB/nested/application-ma.json b/Sitecore 9.0.1/XDB/nested/application-ma.json
@@ -261,7 +261,10 @@
           "XConnect Server Instance Name": "MarketingAutomationReporting",
           "License Xml": "[parameters('licenseXml')]"
         }
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maOpsWebAppNameTidy'), '/', 'appsettings')]",

diff --git a/Sitecore 9.0.1/XP/nested/application-ma.json b/Sitecore 9.0.1/XP/nested/application-ma.json
@@ -261,7 +261,10 @@
           "XConnect Server Instance Name": "MarketingAutomationReporting",
           "License Xml": "[parameters('licenseXml')]"
         }
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maOpsWebAppNameTidy'), '/', 'appsettings')]",
@@ -271,7 +274,7 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0
       },
-        "dependsOn": [
+      "dependsOn": [
         "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },

diff --git a/Sitecore 9.0.2/XDB/nested/application-ma.json b/Sitecore 9.0.2/XDB/nested/application-ma.json
@@ -263,7 +263,10 @@
           "XConnect Server Instance Name": "MarketingAutomationReporting",
           "License Xml": "[parameters('licenseXml')]"
         }
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maOpsWebAppNameTidy'), '/', 'appsettings')]",
@@ -285,7 +288,7 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0
       },
-       "dependsOn": [
+      "dependsOn": [
         "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }

diff --git a/Sitecore 9.0.2/XP/nested/application-ma.json b/Sitecore 9.0.2/XP/nested/application-ma.json
@@ -261,7 +261,10 @@
           "XConnect Server Instance Name": "MarketingAutomationReporting",
           "License Xml": "[parameters('licenseXml')]"
         }
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maOpsWebAppNameTidy'), '/', 'appsettings')]",
@@ -271,7 +274,7 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0
       },
-        "dependsOn": [
+      "dependsOn": [
         "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },
@@ -283,7 +286,7 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0
       },
-       "dependsOn": [
+      "dependsOn": [
         "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }

diff --git a/Sitecore 9.1.0/XDB/nested/application-ma.json b/Sitecore 9.1.0/XDB/nested/application-ma.json
@@ -240,10 +240,7 @@
           "XConnect Server Instance Name": "MarketingAutomation",
           "License Xml": "[parameters('licenseXml')]"
         }
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maOpsWebAppNameTidy'),'appsettings')]"
-      ]
+      }
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'MSDeploy')]",
@@ -272,7 +269,7 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maRepWebAppNameTidy'),'appsettings')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },
     {
@@ -282,7 +279,10 @@
       "properties": {
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'appsettings')]",
@@ -293,7 +293,7 @@
         "WEBSITE_DYNAMIC_CACHE": 0
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }
   ]

diff --git a/Sitecore 9.1.0/XP/nested/application-ma.json b/Sitecore 9.1.0/XP/nested/application-ma.json
@@ -240,10 +240,7 @@
           "XConnect Server Instance Name": "MarketingAutomation",
           "License Xml": "[parameters('licenseXml')]"
         }
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maOpsWebAppNameTidy'),'appsettings')]"
-      ]
+      }
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'MSDeploy')]",
@@ -270,7 +267,7 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maRepWebAppNameTidy'),'appsettings')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },
     {
@@ -280,7 +277,10 @@
       "properties": {
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'appsettings')]",
@@ -291,7 +291,7 @@
         "WEBSITE_DYNAMIC_CACHE": 0
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }
   ]

diff --git a/Sitecore 9.1.1/XDB/nested/application-ma.json b/Sitecore 9.1.1/XDB/nested/application-ma.json
@@ -245,10 +245,7 @@
           "XConnect Server Instance Name": "MarketingAutomation",
           "License Xml": "[parameters('licenseXml')]"
         }
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maOpsWebAppNameTidy'),'appsettings')]"
-      ]
+      }
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'MSDeploy')]",
@@ -277,7 +274,7 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maRepWebAppNameTidy'),'appsettings')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },
     {
@@ -288,7 +285,10 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0,
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'appsettings')]",
@@ -300,7 +300,7 @@
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }
   ]

diff --git a/Sitecore 9.1.1/XP/nested/application-ma.json b/Sitecore 9.1.1/XP/nested/application-ma.json
@@ -245,10 +245,7 @@
           "XConnect Server Instance Name": "MarketingAutomation",
           "License Xml": "[parameters('licenseXml')]"
         }
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maOpsWebAppNameTidy'),'appsettings')]"
-      ]
+      }
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'MSDeploy')]",
@@ -275,7 +272,7 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maRepWebAppNameTidy'),'appsettings')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },
     {
@@ -286,7 +283,10 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0,
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'appsettings')]",
@@ -298,7 +298,7 @@
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }
   ]

diff --git a/Sitecore 9.2.0/XDB/nested/application-ma.json b/Sitecore 9.2.0/XDB/nested/application-ma.json
@@ -236,10 +236,7 @@
           "XConnect Server Instance Name": "MarketingAutomation",
           "License Xml": "[parameters('licenseXml')]"
         }
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maOpsWebAppNameTidy'),'appsettings')]"
-      ]
+      }
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'MSDeploy')]",
@@ -268,7 +265,7 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maRepWebAppNameTidy'),'appsettings')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },
     {
@@ -279,7 +276,10 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0,
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'appsettings')]",
@@ -291,7 +291,7 @@
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }
   ]

diff --git a/Sitecore 9.2.0/XP/nested/application-ma.json b/Sitecore 9.2.0/XP/nested/application-ma.json
@@ -236,10 +236,7 @@
           "XConnect Server Instance Name": "MarketingAutomation",
           "License Xml": "[parameters('licenseXml')]"
         }
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maOpsWebAppNameTidy'),'appsettings')]"
-      ]
+      }
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'MSDeploy')]",
@@ -266,7 +263,7 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/config', variables('maRepWebAppNameTidy'),'appsettings')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
       ]
     },
     {
@@ -277,7 +274,10 @@
         "WEBSITE_LOAD_CERTIFICATES": "[parameters('authCertificateThumbprint')]",
         "WEBSITE_DYNAMIC_CACHE": 0,
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
-      }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+      ]
     },
     {
       "name": "[concat(variables('maRepWebAppNameTidy'), '/', 'appsettings')]",
@@ -289,7 +289,7 @@
         "SITECORE_ENVIRONMENT_TYPE": "[parameters('environmentType')]"
       },
       "dependsOn": [
-        "[resourceId('Microsoft.Web/sites/extensions', variables('maOpsWebAppNameTidy'),'MSDeploy')]"
+        "[resourceId('Microsoft.Web/sites/extensions', variables('maRepWebAppNameTidy'),'MSDeploy')]"
       ]
     }
   ]