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

Pass Digital Ocean ssh_fingerprints as a list 

* Fix digital-ocean module to pass ssh_fingerprints
as a list since the module accepts a list
This commit is contained in:
Sean Swehla 2018-02-24 19:22:57 -05:00 committed by Dalton Hubble
parent 04c6613ff3
commit 0da7757ef4
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -18,6 +18,7 @@ Notable changes between versions.
#### Digital Ocean #### Digital Ocean
* Add kubelet `--volume-plugin-dir` flag to allow flexvolume plugins ([#142](https://github.com/poseidon/typhoon/pull/142)) * Add kubelet `--volume-plugin-dir` flag to allow flexvolume plugins ([#142](https://github.com/poseidon/typhoon/pull/142))
* Fix to pass `ssh_fingerprints` as a list to droplets ([#143](https://github.com/poseidon/typhoon/pull/143))
#### Google Cloud #### Google Cloud

2
digital-ocean/container-linux/kubernetes/controllers.tf
View File

@ -45,7 +45,7 @@ resource "digitalocean_droplet" "controllers" {
private_networking = true private_networking = true
user_data = "${element(data.ct_config.controller_ign.*.rendered, count.index)}" user_data = "${element(data.ct_config.controller_ign.*.rendered, count.index)}"
ssh_keys = "${var.ssh_fingerprints}" ssh_keys = ["${var.ssh_fingerprints}"]
tags = [ tags = [
"${digitalocean_tag.controllers.id}", "${digitalocean_tag.controllers.id}",

2
digital-ocean/container-linux/kubernetes/workers.tf
View File

@ -26,7 +26,7 @@ resource "digitalocean_droplet" "workers" {
private_networking = true private_networking = true
user_data = "${data.ct_config.worker_ign.rendered}" user_data = "${data.ct_config.worker_ign.rendered}"
ssh_keys = "${var.ssh_fingerprints}" ssh_keys = ["${var.ssh_fingerprints}"]
tags = [ tags = [
"${digitalocean_tag.workers.id}", "${digitalocean_tag.workers.id}",