C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2434 from protomech/feature/azure-vnet-resource-group

Browse source 
add support for azure vnetResourceGroup
This commit is contained in:
Aivars Sterns 2018-03-13 17:42:09 +02:00 committed by GitHub
commit 710295bd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inventory/sample/group_vars/all.yml
View file

@ -76,6 +76,7 @@ bin_dir: /usr/local/bin
#azure_subnet_name: #azure_subnet_name:
#azure_security_group_name: #azure_security_group_name:
#azure_vnet_name: #azure_vnet_name:
#azure_vnet_resource_group:
#azure_route_table_name: #azure_route_table_name:
## When OpenStack is used, Cinder version can be explicitly specified if autodetection fails (Fixed in 1.9: https://github.com/kubernetes/kubernetes/issues/50461) ## When OpenStack is used, Cinder version can be explicitly specified if autodetection fails (Fixed in 1.9: https://github.com/kubernetes/kubernetes/issues/50461)

5
roles/kubernetes/preinstall/tasks/azure-credential-check.yml
View file

@ -44,6 +44,11 @@
msg: "azure_vnet_name is missing" msg: "azure_vnet_name is missing"
when: azure_vnet_name is not defined or azure_vnet_name == "" when: azure_vnet_name is not defined or azure_vnet_name == ""
- name: check azure_vnet_resource_group value
fail:
msg: "azure_vnet_resource_group is missing"
when: azure_vnet_resource_group is not defined or azure_vnet_resource_group == ""
- name: check azure_route_table_name value - name: check azure_route_table_name value
fail: fail:
msg: "azure_route_table_name is missing" msg: "azure_route_table_name is missing"

1
roles/kubernetes/preinstall/templates/azure-cloud-config.j2
View file

@ -8,5 +8,6 @@
"subnetName": "{{ azure_subnet_name }}", "subnetName": "{{ azure_subnet_name }}",
"securityGroupName": "{{ azure_security_group_name }}", "securityGroupName": "{{ azure_security_group_name }}",
"vnetName": "{{ azure_vnet_name }}", "vnetName": "{{ azure_vnet_name }}",
"vnetResourceGroup": "{{ azure_vnet_resource_group }}",
"routeTableName": "{{ azure_route_table_name }}" "routeTableName": "{{ azure_route_table_name }}"
} }