diff --git a/src/api-service/__app__/onefuzzlib/workers/scalesets.py b/src/api-service/__app__/onefuzzlib/workers/scalesets.py index 629a566df..c66c34056 100644 --- a/src/api-service/__app__/onefuzzlib/workers/scalesets.py +++ b/src/api-service/__app__/onefuzzlib/workers/scalesets.py @@ -268,6 +268,11 @@ class Scaleset(BASE_SCALESET, ORMMixin): self.scaleset_id, ) + auto_scaling = self.try_to_enable_auto_scaling() + if isinstance(auto_scaling, Error): + self.set_failed(auto_scaling) + return + identity_result = self.try_set_identity(vmss) if identity_result: self.set_failed(identity_result) @@ -869,6 +874,8 @@ class Scaleset(BASE_SCALESET, ORMMixin): logging.error(capacity_failed) return capacity_failed - auto_scale_profile = create_auto_scale_profile(1, capacity, pool_queue_uri) + auto_scale_profile = create_auto_scale_profile( + capacity, capacity, pool_queue_uri + ) logging.info("Added auto scale resource to scaleset: %s" % self.scaleset_id) return add_auto_scale_to_vmss(self.scaleset_id, auto_scale_profile) diff --git a/src/deployment/azuredeploy.json b/src/deployment/azuredeploy.json index 9930c7dd2..b8ca2f8d0 100644 --- a/src/deployment/azuredeploy.json +++ b/src/deployment/azuredeploy.json @@ -67,6 +67,7 @@ "Storage Account Contributor": "17d1049b-9a84-46fb-8f53-869881c3d3ab", "Virtual Machine Contributor": "9980e02c-c2be-4d73-94e8-173b1dc7cf3c", "Storage Blob Data Reader": "2a2b9908-6ea1-4ae2-8e65-a410df84e7d1", + "Contributor": "b24988ac-6180-42a0-ab88-20f7382dd24c", "keyVaultName": "[concat('of-kv-', uniquestring(resourceGroup().id))]" }, "functions": [ @@ -819,6 +820,21 @@ "OWNER": "[parameters('owner')]" } }, + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "2017-09-01", + "name": "[guid(concat(resourceGroup().id, '-contributor'))]", + "properties": { + "roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', variables('Contributor'))]", + "principalId": "[reference(resourceId('Microsoft.Web/sites', parameters('name')), '2018-02-01', 'Full').identity.principalId]" + }, + "DependsOn": [ + "[resourceId('Microsoft.Web/sites', parameters('name'))]" + ], + "tags": { + "OWNER": "[parameters('owner')]" + } + }, { "type": "Microsoft.Authorization/roleAssignments", "apiVersion": "2018-07-01",