From d6aeb767a0e3cb9ef107857e5e711a2d09f637ce Mon Sep 17 00:00:00 2001 From: Abdelsalam Abbas Date: Wed, 19 Jul 2017 18:03:57 +0200 Subject: [PATCH] Add more azure variables for more clarity --- contrib/azurerm/group_vars/all | 22 +++++++++++++++++-- .../generate-templates/defaults/main.yml | 16 +++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/contrib/azurerm/group_vars/all b/contrib/azurerm/group_vars/all index 9cecfd5ed..0e809af80 100644 --- a/contrib/azurerm/group_vars/all +++ b/contrib/azurerm/group_vars/all @@ -1,5 +1,6 @@ -# Due to some Azure limitations, this name must be globally unique +# Due to some Azure limitations (ex:- Storage Account's name must be unique), +# this name must be globally unique - it will be used as a prefix for azure components cluster_name: example # Set this to true if you do not want to have public IPs for your masters and minions. This will provision a bastion @@ -17,12 +18,29 @@ minions_os_disk_size: 1000 admin_username: devops admin_password: changeme + +# MAKE SURE TO CHANGE THIS TO YOUR PUBLIC KEY to access your azure machines ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLRzcxbsFDdEibiyXCSdIFh7bKbXso1NqlKjEyPTptf3aBXHEhVil0lJRjGpTlpfTy7PHvXFbXIOCdv9tOmeH1uxWDDeZawgPFV6VSZ1QneCL+8bxzhjiCn8133wBSPZkN8rbFKd9eEUUBfx8ipCblYblF9FcidylwtMt5TeEmXk8yRVkPiCuEYuDplhc2H0f4PsK3pFb5aDVdaDT3VeIypnOQZZoUxHWqm6ThyHrzLJd3SrZf+RROFWW1uInIDf/SZlXojczUYoffxgT1lERfOJCHJXsqbZWugbxQBwqsVsX59+KPxFFo6nV88h3UQr63wbFx52/MXkX4WrCkAHzN ablock-vwfs@dell-lappy" -kube_apiserver_port: 6443 +# Disable using ssh using password. Change it to false to allow to connect to ssh by password +disablePasswordAuthentication: true # Azure CIDRs azure_vnet_cidr: 10.0.0.0/8 azure_admin_cidr: 10.241.2.0/24 azure_masters_cidr: 10.0.4.0/24 azure_minions_cidr: 10.240.0.0/16 + +# Azure loadbalancer port to use to access your cluster +kube_apiserver_port: 6443 + +# Azure Netwoking and storage naming to use with inventory/all.yml +#azure_virtual_network_name: KubeVNET +#azure_subnet_admin_name: ad-subnet +#azure_subnet_masters_name: master-subnet +#azure_subnet_minions_name: minion-subnet +#azure_route_table_name: routetable +#azure_security_group_name: secgroup + +# Storage types available are: "Standard_LRS","Premium_LRS" +#azure_storage_account_type: Standard_LRS diff --git a/contrib/azurerm/roles/generate-templates/defaults/main.yml b/contrib/azurerm/roles/generate-templates/defaults/main.yml index 5ea0ff548..8f5ab94a1 100644 --- a/contrib/azurerm/roles/generate-templates/defaults/main.yml +++ b/contrib/azurerm/roles/generate-templates/defaults/main.yml @@ -1,15 +1,15 @@ apiVersion: "2015-06-15" -virtualNetworkName: "KubVNET" +virtualNetworkName: "{{ azure_virtual_network_name | default('KubeVNET') }}" -subnetAdminName: "ad-subnet" -subnetMastersName: "master-subnet" -subnetMinionsName: "minion-subnet" +subnetAdminName: "{{ azure_subnet_admin_name | default('ad-subnet') }}" +subnetMastersName: "{{ azure_subnet_masters_name | default('master-subnet') }}" +subnetMinionsName: "{{ azure_subnet_minions_name | default('minion-subnet') }}" -routeTableName: "routetable" -securityGroupName: "secgroup" +routeTableName: "{{ azure_route_table_name | default('routetable') }}" +securityGroupName: "{{ azure_security_group_name | default('secgroup') }}" -nameSuffix: "{{cluster_name}}" +nameSuffix: "{{ cluster_name }}" availabilitySetMasters: "master-avs" availabilitySetMinions: "minion-avs" @@ -33,5 +33,5 @@ imageReference: imageReferenceJson: "{{imageReference|to_json}}" storageAccountName: "sa{{nameSuffix | replace('-', '')}}" -storageAccountType: "Standard_LRS" +storageAccountType: "{{ azure_storage_account_type | default('Standard_LRS') }}"