df6c5b28a1
* [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.
79 lines
3.2 KiB
HCL
79 lines
3.2 KiB
HCL
module "network" {
|
|
source = "modules/network"
|
|
|
|
external_net = "${var.external_net}"
|
|
network_name = "${var.network_name}"
|
|
cluster_name = "${var.cluster_name}"
|
|
dns_nameservers = "${var.dns_nameservers}"
|
|
}
|
|
|
|
module "ips" {
|
|
source = "modules/ips"
|
|
|
|
number_of_k8s_masters = "${var.number_of_k8s_masters}"
|
|
number_of_k8s_masters_no_etcd = "${var.number_of_k8s_masters_no_etcd}"
|
|
number_of_k8s_nodes = "${var.number_of_k8s_nodes}"
|
|
floatingip_pool = "${var.floatingip_pool}"
|
|
number_of_bastions = "${var.number_of_bastions}"
|
|
external_net = "${var.external_net}"
|
|
network_name = "${var.network_name}"
|
|
router_id = "${module.network.router_id}"
|
|
}
|
|
|
|
module "compute" {
|
|
source = "modules/compute"
|
|
|
|
cluster_name = "${var.cluster_name}"
|
|
number_of_k8s_masters = "${var.number_of_k8s_masters}"
|
|
number_of_k8s_masters_no_etcd = "${var.number_of_k8s_masters_no_etcd}"
|
|
number_of_etcd = "${var.number_of_etcd}"
|
|
number_of_k8s_masters_no_floating_ip = "${var.number_of_k8s_masters_no_floating_ip}"
|
|
number_of_k8s_masters_no_floating_ip_no_etcd = "${var.number_of_k8s_masters_no_floating_ip_no_etcd}"
|
|
number_of_k8s_nodes = "${var.number_of_k8s_nodes}"
|
|
number_of_bastions = "${var.number_of_bastions}"
|
|
number_of_k8s_nodes_no_floating_ip = "${var.number_of_k8s_nodes_no_floating_ip}"
|
|
number_of_gfs_nodes_no_floating_ip = "${var.number_of_gfs_nodes_no_floating_ip}"
|
|
gfs_volume_size_in_gb = "${var.gfs_volume_size_in_gb}"
|
|
public_key_path = "${var.public_key_path}"
|
|
image = "${var.image}"
|
|
image_gfs = "${var.image_gfs}"
|
|
ssh_user = "${var.ssh_user}"
|
|
ssh_user_gfs = "${var.ssh_user_gfs}"
|
|
flavor_k8s_master = "${var.flavor_k8s_master}"
|
|
flavor_k8s_node = "${var.flavor_k8s_node}"
|
|
flavor_etcd = "${var.flavor_etcd}"
|
|
flavor_gfs_node = "${var.flavor_gfs_node}"
|
|
network_name = "${var.network_name}"
|
|
flavor_bastion = "${var.flavor_bastion}"
|
|
k8s_master_fips = "${module.ips.k8s_master_fips}"
|
|
k8s_node_fips = "${module.ips.k8s_node_fips}"
|
|
bastion_fips = "${module.ips.bastion_fips}"
|
|
supplementary_master_groups = "${var.supplementary_master_groups}"
|
|
|
|
network_id = "${module.network.router_id}"
|
|
}
|
|
|
|
output "private_subnet_id" {
|
|
value = "${module.network.subnet_id}"
|
|
}
|
|
|
|
output "floating_network_id" {
|
|
value = "${var.external_net}"
|
|
}
|
|
|
|
output "router_id" {
|
|
value = "${module.network.router_id}"
|
|
}
|
|
|
|
output "k8s_master_fips" {
|
|
value = "${module.ips.k8s_master_fips}"
|
|
}
|
|
|
|
output "k8s_node_fips" {
|
|
value = "${module.ips.k8s_node_fips}"
|
|
}
|
|
|
|
output "bastion_fips" {
|
|
value = "${module.ips.bastion_fips}"
|
|
}
|