examples/terraform: Update bare-metal module version

* Upstream fixes to bump all control plane components to v1.7.5
* Stop including etcd-network-checkpointer with on-host etcd
* Remove experimental_self_hosted_etcd support
This commit is contained in:
Dalton Hubble
2017-09-28 11:25:52 -07:00
parent 5aa301b72d
commit 592969134c
5 changed files with 1 additions and 10 deletions

View File

@@ -68,7 +68,6 @@ You may set certain optional variables to override defaults. Set `networking` to
# cached_install = "false"
# install_disk = "/dev/sda"
# container_linux_oem = ""
# experimental_self_hosted_etcd = "false"
# networking = "flannel"
```

View File

@@ -1,6 +1,6 @@
// Kubernetes cluster
module "cluster" {
source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=0d6410505d8d65cef94a1a3f2f921327e88adfd2"
source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=f7dd959e9c444ce1b2759a214b99990b89705ac4"
# install
matchbox_http_endpoint = "${var.matchbox_http_endpoint}"
@@ -28,5 +28,4 @@ module "cluster" {
cached_install = "${var.cached_install}"
install_disk = "${var.install_disk}"
container_linux_oem = "${var.container_linux_oem}"
experimental_self_hosted_etcd = "${var.experimental_self_hosted_etcd}"
}

View File

@@ -20,4 +20,3 @@ asset_dir = "assets"
# Optional
# container_linux_oem = ""
# experimental_self_hosted_etcd = "true"

View File

@@ -22,5 +22,4 @@ asset_dir = "assets"
cached_install = "true"
# install_disk = "/dev/sda"
# container_linux_oem = ""
# experimental_self_hosted_etcd = "false"
# networking = "flannel"

View File

@@ -108,8 +108,3 @@ variable "container_linux_oem" {
default = ""
description = "Specify an OEM image id to use as base for the installation (e.g. ami, vmware_raw, xen) or leave blank for the default image"
}
variable "experimental_self_hosted_etcd" {
default = "false"
description = "Create self-hosted etcd cluster as pods on Kubernetes, instead of on-hosts"
}