From ef10295e892e142679309dda6f9d3e96e7d417da Mon Sep 17 00:00:00 2001 From: Cory Johns Date: Wed, 22 Aug 2018 12:03:16 -0400 Subject: [PATCH] Add missing config for Azure integration --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 7 ++++++- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 1ef69367897..89a58475907 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -1891,6 +1891,11 @@ def _write_azure_snap_config(component): cloud_config_path.write_text(json.dumps({ 'useInstanceMetadata': True, 'useManagedIdentityExtension': True, - 'resourceGroup': azure.resource_group, 'subscriptionId': azure.subscription_id, + 'resourceGroup': azure.resource_group, + 'location': azure.resource_group_location, + 'vnetName': azure.vnet_name, + 'vnetResourceGroup': azure.vnet_resource_group, + 'subnetName': azure.subnet_name, + 'securityGroupName': azure.security_group_name, })) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index e00ef541c85..3bf60106b46 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -1425,8 +1425,13 @@ def _write_azure_snap_config(component): cloud_config_path.write_text(json.dumps({ 'useInstanceMetadata': True, 'useManagedIdentityExtension': True, - 'resourceGroup': azure.resource_group, 'subscriptionId': azure.subscription_id, + 'resourceGroup': azure.resource_group, + 'location': azure.resource_group_location, + 'vnetName': azure.vnet_name, + 'vnetResourceGroup': azure.vnet_resource_group, + 'subnetName': azure.subnet_name, + 'securityGroupName': azure.security_group_name, }))