C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
c12s-kubespray/contrib/terraform/openstack/kubespray.tf

102 lines
4.8 KiB
Terraform
Raw Normal View History

Pin Terraform provider versions (#4620)
2019-04-24 05:22:01 +00:00
provider "openstack" {
version = "~> 1.17"
}
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
module "network" {
Updated Openstack to terraform 0.12 (#5062) * update openstack to terraform 0.12(.5) * replace cluter.tf with cluster.tfvars * update README.md to terraform 0.12 * update Openstack CI tests to use terraform 0.12 * specify terraform version in openstack README * gitlab CI to copy cluster.tfvars in case of openstack provider * The terraform/openstack dynamic inventory can read tfstate v4 (generated by terraform 0.12) and convert them internally ro v3 (as generated by terraform 0.11.x). Additionally the script has been updated to Python 3.
2019-08-18 08:30:05 +00:00
source = "./modules/network"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
terraform/openstack: add network_dns_domain variable (#5093) This allows the user to optionally specify the dns_domain attribute on the generated internal kubernetes network.
2019-08-21 12:09:15 +00:00
external_net = "${var.external_net}"
network_name = "${var.network_name}"
subnet_cidr = "${var.subnet_cidr}"
cluster_name = "${var.cluster_name}"
dns_nameservers = "${var.dns_nameservers}"
network_dns_domain = "${var.network_dns_domain}"
use_neutron = "${var.use_neutron}"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
}
module "ips" {
Updated Openstack to terraform 0.12 (#5062) * update openstack to terraform 0.12(.5) * replace cluter.tf with cluster.tfvars * update README.md to terraform 0.12 * update Openstack CI tests to use terraform 0.12 * specify terraform version in openstack README * gitlab CI to copy cluster.tfvars in case of openstack provider * The terraform/openstack dynamic inventory can read tfstate v4 (generated by terraform 0.12) and convert them internally ro v3 (as generated by terraform 0.11.x). Additionally the script has been updated to Python 3.
2019-08-18 08:30:05 +00:00
source = "./modules/ips"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
run terraform FMT for readability
2018-01-05 11:09:04 +00:00
number_of_k8s_masters = "${var.number_of_k8s_masters}"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
number_of_k8s_masters_no_etcd = "${var.number_of_k8s_masters_no_etcd}"
run terraform FMT for readability
2018-01-05 11:09:04 +00:00
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}"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
}
module "compute" {
Updated Openstack to terraform 0.12 (#5062) * update openstack to terraform 0.12(.5) * replace cluter.tf with cluster.tfvars * update README.md to terraform 0.12 * update Openstack CI tests to use terraform 0.12 * specify terraform version in openstack README * gitlab CI to copy cluster.tfvars in case of openstack provider * The terraform/openstack dynamic inventory can read tfstate v4 (generated by terraform 0.12) and convert them internally ro v3 (as generated by terraform 0.11.x). Additionally the script has been updated to Python 3.
2019-08-18 08:30:05 +00:00
source = "./modules/compute"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
run terraform FMT for readability
2018-01-05 11:09:04 +00:00
cluster_name = "${var.cluster_name}"
availability zones support for OpenStack allow masters, nodes and gluster nodes (within each group) to be scheduled on differents AZ.
2018-07-31 09:18:27 +00:00
az_list = "${var.az_list}"
run terraform FMT for readability
2018-01-05 11:09:04 +00:00
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}"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
number_of_k8s_masters_no_floating_ip_no_etcd = "${var.number_of_k8s_masters_no_floating_ip_no_etcd}"
run terraform FMT for readability
2018-01-05 11:09:04 +00:00
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}"
Customize host root volume size by Terrafrom provisioning (#4239) * print hostnames (#5110) Terrafrom - customize hosts root volume size disable block_device by default value Terraform formatting fix Fixed typos * fix resources after rebase * Fix glusterfs image issue
2019-09-25 12:17:59 +00:00
bastion_root_volume_size_in_gb = "${var.bastion_root_volume_size_in_gb}"
etcd_root_volume_size_in_gb = "${var.etcd_root_volume_size_in_gb}"
master_root_volume_size_in_gb = "${var.master_root_volume_size_in_gb}"
node_root_volume_size_in_gb = "${var.node_root_volume_size_in_gb}"
gfs_root_volume_size_in_gb = "${var.gfs_root_volume_size_in_gb}"
run terraform FMT for readability
2018-01-05 11:09:04 +00:00
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}"
associate fips for masters with no etcd (#4657)
2019-04-29 05:58:20 +00:00
k8s_master_no_etcd_fips = "${module.ips.k8s_master_no_etcd_fips}"
run terraform FMT for readability
2018-01-05 11:09:04 +00:00
k8s_node_fips = "${module.ips.k8s_node_fips}"
bastion_fips = "${module.ips.bastion_fips}"
Change from Nova security groups to Neutron (#2910) * Replace `openstack_compute_secgroup_v2` with `openstack_networking_secgroup_v2` The `openstack_networking_secgroup_v2` resource allow specifications of both ingress and egress. Nova security groups define ingress rules only. This change will also allow for more user-friendly specified security rules, as the different security group resources have different HCL syntax.
2018-09-28 09:35:02 +00:00
bastion_allowed_remote_ips = "${var.bastion_allowed_remote_ips}"
add master_allowed_remote_ips (with terraform fmt) (#4022)
2019-04-21 08:57:44 +00:00
master_allowed_remote_ips = "${var.master_allowed_remote_ips}"
[contrib/terraform/openstack] Add k8s_allowed_remote_ips variable (#4506) * Add k8s_allowed_remote_ips variable Useful for defining CIDRs allowed to initiate a SSH connection when you don't want to use a bastion. * Add TF_VAR_k8s_allowed_remote_ips variable to tf-apply-ovh
2019-04-15 14:22:08 +00:00
k8s_allowed_remote_ips = "${var.k8s_allowed_remote_ips}"
Disable usage of default security group (#4533)
2019-04-17 09:10:03 +00:00
k8s_allowed_egress_ips = "${var.k8s_allowed_egress_ips}"
[contrib/terraform/openstack] Backward compatibility changes (#2539) * [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.
2018-04-30 15:11:07 +00:00
supplementary_master_groups = "${var.supplementary_master_groups}"
[contrib/terraform/openstack] Add supplementary node groups * Add supplementary node groups To add additional ansible groups to the k8s nodes, such as `kube-ingress` for running ingress controller pods. Empty by default.
2018-06-28 14:32:59 +00:00
supplementary_node_groups = "${var.supplementary_node_groups}"
Add worker_allowed_ports * [contrib/terraform/openstack] Add worker_allowed_ports Allow user to define in terraform template which ports and remote IPs that are allowed to access worker nodes. This is useful when you don't want to open up whole NodePort range to the outside world, or ports outside NodePort range.
2018-10-31 11:09:22 +00:00
worker_allowed_ports = "${var.worker_allowed_ports}"
Terraform wait for floating IP instance has been associated (#4321) * Add wait for floating ip associate with instance * Terraform formatting fix * Sort Open Telekom Cloud in compatible list
2019-05-09 09:16:50 +00:00
wait_for_floatingip = "${var.wait_for_floatingip}"
Make it possible to disable access_ip (openstack provider) (#5239) * Add a variable do disable access_ip * Document the use of use_access_ip
2019-10-07 11:09:09 +00:00
use_access_ip = "${var.use_access_ip}"
Support Openstack servergroups (#5412) * add support for nova servergroups * Add documentation for openstack nova servergroups * uppdate to TF 0.12.12 format and fix etcd * revert for_each change * fix variables and formatting in main.tf * try to avoid errors * update variable * Update main.tf * Update main.tf * update all other instance resources
2019-12-09 09:15:10 +00:00
use_server_groups = "${var.use_server_groups}"
Update OpenStack Terraform: Modules, Bastions, and New Floating IP config (#1958) * Adding bastion and private network provisioning for openstack terraform * Remove usage of floating-ip property * Combine openstack instances + floating ips * Fix relating floating IPs to hosts for openstack builds * Tighten up security groups Allow ssh into all instances with floating IP * Add the gluster hosts to the no-floating group * Break terraform into modules * Update README and var descriptions to match current config * Remove volume property in gluster compute def * Include cluster name in internal network and router names * Make dns_nameservers a variable
2017-12-05 12:48:47 +00:00
network_id = "${module.network.router_id}"
adds ability to have hosts with no floating ips on terraform/openstack (+8 squashed commits) Squashed commits: [f9355ea] Swap order in which we reload docker/socket [2ca6819] Reload docker.socket after installing flannel on coreos Workaround for #569 [9f976e5] Vagrantfile: setup proxy inside virtual machines In corporate networks, it is good to pre-configure proxy variables. [9d7142f] Vagrantfile: use Ubuntu 16.04 LTS Use recent supported version of Ubuntu for local development setup with Vagrant. [50f77cc] Add CI test layouts * Drop Wily from test matrix * Replace the Wily cases dropped with extra cases to test separate roles deployment Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com> [03e162b] Update OWNERS [c7b00ca] Use tar+register instead of copy/slurp for distributing tokens and certs Related bug: https://github.com/ansible/ansible/issues/15405 Uses tar and register because synchronize module cannot sudo on the remote side correctly and copy is too slow. This patch dramatically cuts down the number of tasks to process for cert synchronization. [2778ac6] Add new var skip_dnsmasq_k8s If skip_dnsmasq is set, it will still not set up dnsmasq k8s pod. This enables independent setup of resolvconf section before kubelet is up.
2016-10-26 14:56:15 +00:00
}
Update Terraform docs and authentication method Hardcoded variables are removed from variables.tf file because it might not be suitable for all OpenStack Cloud depending on Identity API version available (between v2 or v3) and preferred authentication method.
2017-12-06 14:58:40 +00:00
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" {
associate fips for masters with no etcd (#4657)
2019-04-29 05:58:20 +00:00
value = "${concat(module.ips.k8s_master_fips, module.ips.k8s_master_no_etcd_fips)}"
Update Terraform docs and authentication method Hardcoded variables are removed from variables.tf file because it might not be suitable for all OpenStack Cloud depending on Identity API version available (between v2 or v3) and preferred authentication method.
2017-12-06 14:58:40 +00:00
}
output "k8s_node_fips" {
value = "${module.ips.k8s_node_fips}"
}
output "bastion_fips" {
value = "${module.ips.bastion_fips}"
}
Reference in a new issue Copy permalink