File tree Expand file tree Collapse file tree
deployment/terraform/modules/openstack-kubernetes-infra Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ resource "openstack_compute_instance_v2" "kubernetes_server" {
2525}
2626
2727resource "null_resource" "kubernetes_server_provisioner" {
28- depends_on = [openstack_compute_instance_v2 . kubernetes_server ]
28+ depends_on = [openstack_compute_instance_v2 . kubernetes_server , openstack_networking_floatingip_associate_v2 . kubernetes_server_fip ]
2929
3030 connection {
3131 user = " ubuntu"
@@ -41,12 +41,17 @@ resource "null_resource" "kubernetes_server_provisioner" {
4141}
4242
4343resource "openstack_compute_instance_v2" "kubernetes_nodes" {
44- depends_on = [openstack_compute_instance_v2 . kubernetes_server ]
45- for_each = { for vm in var . host_instances : vm . name => vm if ! vm . is_controller }
46- name = local. prefix != " " ? " ${ local . prefix } -${ each . value . name } " : each. value . name
47- flavor_id = data. openstack_compute_flavor_v2 . available_compute_flavors [each . value . flavour ]. id
48- key_pair = openstack_compute_keypair_v2. compute_keypair . name
49- region = " RegionOne"
44+ depends_on = [
45+ openstack_compute_instance_v2 . kubernetes_server ,
46+ openstack_networking_floatingip_associate_v2 . kubernetes_nodes_fip
47+ ]
48+
49+ for_each = { for vm in var . host_instances : vm . name => vm if ! vm . is_controller }
50+
51+ name = local. prefix != " " ? " ${ local . prefix } -${ each . value . name } " : each. value . name
52+ flavor_id = data. openstack_compute_flavor_v2 . available_compute_flavors [each . value . flavour ]. id
53+ key_pair = openstack_compute_keypair_v2. compute_keypair . name
54+ region = " RegionOne"
5055
5156 user_data = data. cloudinit_config . init_docker . rendered
5257 security_groups = [" default" ,
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ resource "openstack_networking_secgroup_rule_v2" "cogstack_apps_port_rules" {
3333
3434# Look up ports by device_id and network_id
3535data "openstack_networking_port_v2" "server_port" {
36- count = local. controller_host_has_floating_ip ? 1 : 0
36+ count = local. controller_host_has_floating_ip ? 1 : 0
3737 device_id = openstack_compute_instance_v2. kubernetes_server . id
3838 network_id = openstack_compute_instance_v2. kubernetes_server . network [0 ]. uuid
3939}
@@ -46,14 +46,14 @@ data "openstack_networking_port_v2" "nodes_port" {
4646
4747# Associate floating IP with kubernetes server
4848resource "openstack_networking_floatingip_associate_v2" "kubernetes_server_fip" {
49- count = local. controller_host_has_floating_ip ? 1 : 0
49+ count = local. controller_host_has_floating_ip ? 1 : 0
5050 floating_ip = local. controller_host . floating_ip . address
5151 port_id = data. openstack_networking_port_v2 . server_port [0 ]. id
5252}
5353
5454# Associate floating IPs with kubernetes nodes
5555resource "openstack_networking_floatingip_associate_v2" "kubernetes_nodes_fip" {
56- for_each = { for vm in var . host_instances : vm . name => vm if ! vm . is_controller && vm . floating_ip != null && vm . floating_ip . use_floating_ip }
56+ for_each = { for vm in var . host_instances : vm . name => vm if ! vm . is_controller && vm . floating_ip != null && vm . floating_ip . use_floating_ip }
5757 floating_ip = each. value . floating_ip . address
5858 port_id = data. openstack_networking_port_v2 . nodes_port [each . key ]. id
5959}
You can’t perform that action at this time.
0 commit comments