External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-18 19:50:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

[contrib/terraform/openstack] Backward compatibility changes (#2539)

Browse Source 
* [terraform/openstack] Restores ability to use existing public nodes and masters as bastion.

* [terraform/openstack] Uses network_id as output

* [terraform/openstack] Fixes link to inventory/local/group_vars

* [terraform/openstack] Adds supplementary master groups

* [terraform/openstack] Updates documentation avoiding manual setups for bastion (as they are not needed now).

* [terraform/openstack] Supplementary master groups in docs.

* [terraform/openstack] Fixes repeated usage of master fips instead of bastion fips

* [terraform/openstack] Missing change for network_id to subnet_id

* [terraform/openstack] Changes conditional to element( concat ) form to avoid type issues with empty lists.
This commit is contained in:
Pablo Moreno
2018-04-30 16:11:07 +01:00
committed by Matthew Mosesohn
parent 59789ae02a
commit df6c5b28a1
6 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/terraform/openstack/variables.tf
View File

@@ -111,3 +111,8 @@ variable "floatingip_pool" {
variable "external_net" {
description = "uuid of the external/public network"
}
variable "supplementary_master_groups" {
description = "supplementary kubespray ansible groups for masters, such kube-node"
default = ""
}