CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix possible deadlock for provisioning bare-metal clusters 

* Closes #235
This commit is contained in:
Dalton Hubble 2018-06-14 22:43:01 -07:00
parent 51906bf398
commit ed0b781296
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES.md
View File

@ -4,7 +4,11 @@ Notable changes between versions.
## Latest ## Latest
* Update etcd from v3.3.6 to v3.3.7 * Update etcd from v3.3.6 to v3.3.7 ([#243](https://github.com/poseidon/typhoon/pull/243))
#### Bare-Metal
* Fix possible deadlock when provisioning clusters larger than 10 nodes ([#244](https://github.com/poseidon/typhoon/pull/244))
#### Addons #### Addons

16
bare-metal/container-linux/kubernetes/ssh.tf
View File

@ -2,6 +2,14 @@
resource "null_resource" "copy-controller-secrets" { resource "null_resource" "copy-controller-secrets" {
count = "${length(var.controller_names)}" count = "${length(var.controller_names)}"
# Without depends_on, remote-exec could start and wait for machines before
# matchbox groups are written, causing a deadlock.
depends_on = [
"matchbox_group.install",
"matchbox_group.controller",
"matchbox_group.worker",
]
connection { connection {
type = "ssh" type = "ssh"
host = "${element(var.controller_domains, count.index)}" host = "${element(var.controller_domains, count.index)}"
@ -70,6 +78,14 @@ resource "null_resource" "copy-controller-secrets" {
resource "null_resource" "copy-worker-secrets" { resource "null_resource" "copy-worker-secrets" {
count = "${length(var.worker_names)}" count = "${length(var.worker_names)}"
# Without depends_on, remote-exec could start and wait for machines before
# matchbox groups are written, causing a deadlock.
depends_on = [
"matchbox_group.install",
"matchbox_group.controller",
"matchbox_group.worker",
]
connection { connection {
type = "ssh" type = "ssh"
host = "${element(var.worker_domains, count.index)}" host = "${element(var.worker_domains, count.index)}"

16
bare-metal/fedora-atomic/kubernetes/ssh.tf
View File

@ -2,6 +2,14 @@
resource "null_resource" "copy-controller-secrets" { resource "null_resource" "copy-controller-secrets" {
count = "${length(var.controller_names)}" count = "${length(var.controller_names)}"
# Without depends_on, remote-exec could start and wait for machines before
# matchbox groups are written, causing a deadlock.
depends_on = [
"matchbox_group.install",
"matchbox_group.controller",
"matchbox_group.worker",
]
connection { connection {
type = "ssh" type = "ssh"
host = "${element(var.controller_domains, count.index)}" host = "${element(var.controller_domains, count.index)}"
@ -68,6 +76,14 @@ resource "null_resource" "copy-controller-secrets" {
resource "null_resource" "copy-worker-secrets" { resource "null_resource" "copy-worker-secrets" {
count = "${length(var.worker_names)}" count = "${length(var.worker_names)}"
# Without depends_on, remote-exec could start and wait for machines before
# matchbox groups are written, causing a deadlock.
depends_on = [
"matchbox_group.install",
"matchbox_group.controller",
"matchbox_group.worker",
]
connection { connection {
type = "ssh" type = "ssh"
host = "${element(var.worker_domains, count.index)}" host = "${element(var.worker_domains, count.index)}"