[ARVADOS] updated: 1.3.0-2820-g4d3ddc879
Git user
git at public.arvados.org
Wed Jul 22 20:31:55 UTC 2020
Summary of changes:
.../install-dispatch-cloud.html.textile.liquid | 19 +++++++++++++------
lib/cloud/azure/azure.go | 8 +++++++-
lib/config/config.default.yml | 18 +++++++++++++++++-
lib/config/generated_config.go | 18 +++++++++++++++++-
4 files changed, 54 insertions(+), 9 deletions(-)
via 4d3ddc879fbc1dc39407c8b6e5b2f034d2d94e1e (commit)
via 8713dc0a0b40eb00228c229879183544e87be906 (commit)
from 715b5afbe744a85893eca159109658bb8cddc97f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 4d3ddc879fbc1dc39407c8b6e5b2f034d2d94e1e
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Wed Jul 22 16:28:57 2020 -0400
16623: Add NetworkResourceGroup to install-dispatch-cloud
refs #16623
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/doc/install/install-dispatch-cloud.html.textile.liquid b/doc/install/install-dispatch-cloud.html.textile.liquid
index 7bff6a4a2..ceb02c519 100644
--- a/doc/install/install-dispatch-cloud.html.textile.liquid
+++ b/doc/install/install-dispatch-cloud.html.textile.liquid
@@ -141,19 +141,26 @@ h4. Minimal configuration example for Azure
ImageID: "https://zzzzzzzz.blob.core.windows.net/system/Microsoft.Compute/Images/images/zzzzz-compute-osDisk.55555555-5555-5555-5555-555555555555.vhd"
Driver: azure
DriverParameters:
+ # Credentials.
SubscriptionID: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
ClientID: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
ClientSecret: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
TenantID: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
- CloudEnvironment: AzurePublicCloud
- ResourceGroup: zzzzz
+
+ # Data center where VMs will be allocated
Location: centralus
- Network: zzzzz
- Subnet: zzzzz-subnet-private
+
+ # The resource group where the VM and virtual NIC will be
+ # created.
+ ResourceGroup: zzzzz
+ NetworkResourceGroup: yyyyy # only if different from ResourceGroup
+ Network: xxxxx
+ Subnet: xxxxx-subnet-private
+
+ # Where to store the VM VHD blobs
StorageAccount: example
BlobContainer: vhds
- DeleteDanglingResourcesAfter: 20s
- AdminUsername: arvados
+
</code></pre>
</notextile>
commit 8713dc0a0b40eb00228c229879183544e87be906
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Wed Jul 22 14:58:59 2020 -0400
16623: Add NetworkResourceGroup option for Azure
refs #16623
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/lib/cloud/azure/azure.go b/lib/cloud/azure/azure.go
index 752de152d..6de367aa2 100644
--- 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)),
},
diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 907acdc87..96291a2d4 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1008,13 +1008,29 @@ Clusters:
# (azure) Instance configuration.
CloudEnvironment: AzurePublicCloud
- ResourceGroup: ""
Location: centralus
+
+ # (azure) The resource group where the VM and virtual NIC will be
+ # created.
+ ResourceGroup: ""
+
+ # (azure) The resource group of the Network to use for the virtual
+ # NIC (if different from ResourceGroup)
+ NetworkResourceGroup: ""
Network: ""
Subnet: ""
+
+ # (azure) Where to store the VM VHD blobs
StorageAccount: ""
BlobContainer: ""
+
+ # (azure) How long to wait before deleting VHD and NIC
+ # objects that are no longer being used.
DeleteDanglingResourcesAfter: 20s
+
+ # Account (that already exists in the VM image) that will be
+ # set up with an ssh authorized key to allow the compute
+ # dispatcher to connect.
AdminUsername: arvados
InstanceTypes:
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 96da19dfc..2790477e4 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1014,13 +1014,29 @@ Clusters:
# (azure) Instance configuration.
CloudEnvironment: AzurePublicCloud
- ResourceGroup: ""
Location: centralus
+
+ # (azure) The resource group where the VM and virtual NIC will be
+ # created.
+ ResourceGroup: ""
+
+ # (azure) The resource group of the Network to use for the virtual
+ # NIC (if different from ResourceGroup)
+ NetworkResourceGroup: ""
Network: ""
Subnet: ""
+
+ # (azure) Where to store the VM VHD blobs
StorageAccount: ""
BlobContainer: ""
+
+ # (azure) How long to wait before deleting VHD and NIC
+ # objects that are no longer being used.
DeleteDanglingResourcesAfter: 20s
+
+ # Account (that already exists in the VM image) that will be
+ # set up with an ssh authorized key to allow the compute
+ # dispatcher to connect.
AdminUsername: arvados
InstanceTypes:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list