16623: Add NetworkResourceGroup option for Azure

[arvados.git] / lib / cloud / azure / azure.go

diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go
index 752de152da96a2dd7895a770ebd142b3139f5ffe..6de367aa251c4c034b77331befde540782dc89d5 100644 (file)
--- a/lib/cloud/azure/azure.go
+++ b/lib/cloud/azure/azure.go
@@ -43,6 +43,7 @@ type azureInstanceSetConfig struct {
        ResourceGroup                string
        Location                     string
        Network                      string
+       NetworkResourceGroup         string
        Subnet                       string
        StorageAccount               string
        BlobContainer                string
@@ -356,6 +357,11 @@ func (az *azureInstanceSet) Create(
        }
        tags["created-at"] = to.StringPtr(time.Now().Format(time.RFC3339Nano))
 
+       networkResourceGroup := az.azconfig.NetworkResourceGroup
+       if networkResourceGroup == "" {
+               networkResourceGroup = az.azconfig.ResourceGroup
+       }
+
        nicParameters := network.Interface{
                Location: &az.azconfig.Location,
                Tags:     tags,
@@ -368,7 +374,7 @@ func (az *azureInstanceSet) Create(
                                                        ID: to.StringPtr(fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers"+
                                                                "/Microsoft.Network/virtualnetworks/%s/subnets/%s",
                                                                az.azconfig.SubscriptionID,
-                                                               az.azconfig.ResourceGroup,
+                                                               networkResourceGroup,
                                                                az.azconfig.Network,
                                                                az.azconfig.Subnet)),
                                                },