bare-metal: Remove support for experimental_self_hosted_etcd

* Transition from discouraging self-hosted etcd for bare-metal,
to removing it as an option
* See #13 and FAQ for self-hosted etcd discussion
This commit is contained in:
Dalton Hubble
2017-09-23 12:52:50 -07:00
parent 4ea85b1ac8
commit 68726a2773
6 changed files with 2 additions and 14 deletions

View File

@ -10,5 +10,4 @@ module "bootkube" {
network_mtu = "${var.network_mtu}"
pod_cidr = "${var.pod_cidr}"
service_cidr = "${var.service_cidr}"
experimental_self_hosted_etcd = "${var.experimental_self_hosted_etcd}"
}

View File

@ -1,7 +1,6 @@
---
systemd:
units:
{{ if eq .etcd_on_host "true" }}
- name: etcd-member.service
enable: true
dropins:
@ -25,7 +24,6 @@ systemd:
Environment="ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt"
Environment="ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key"
Environment="ETCD_PEER_CLIENT_CERT_AUTH=true"
{{ end }}
- name: docker.service
enable: true
- name: locksmithd.service

View File

@ -23,10 +23,6 @@ resource "matchbox_group" "controller" {
mac = "${element(var.controller_macs, count.index)}"
os = "installed"
}
metadata {
etcd_on_host = "${var.experimental_self_hosted_etcd ? "false" : "true"}"
}
}
resource "matchbox_group" "worker" {

View File

@ -109,8 +109,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"
}