Skip to content

Commit

Permalink
Merge pull request #111 from utilitywarehouse/etcd-flatcar-path
Browse files Browse the repository at this point in the history
save etcd uuid file under /var/lib/{flatcar,coreos}
  • Loading branch information
ribbybibby committed Mar 18, 2020
2 parents d26ff3a + b235f7c commit 39f1361
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions etcd.tf
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ data "template_file" "etcd-member-dropin" {
index = count.index
etcd_initial_cluster = join(",", formatlist("member%s=https://%s:2380", null_resource.etcd_member.*.triggers.index, var.etcd_addresses))
private_ipv4 = var.etcd_addresses[count.index]
uuid_file = "/var/lib/${var.container_linux_distribution}/etcd-member-wrapper.uuid"
}
}

Expand Down
2 changes: 1 addition & 1 deletion resources/etcd-member-dropin.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Environment="ETCD_PEER_TRUSTED_CA_FILE=/etc/etcd/ssl/ca.pem"
Environment="ETCD_PEER_CERT_FILE=/etc/etcd/ssl/node.pem"
Environment="ETCD_PEER_KEY_FILE=/etc/etcd/ssl/node-key.pem"
Environment="RKT_RUN_ARGS=\
--uuid-file-save=/var/run/etcd-member-wrapper.uuid \
--uuid-file-save=${uuid_file} \
--volume etc-etcd,kind=host,source=/etc/etcd,readOnly=true \
--mount volume=etc-etcd,target=/etc/etcd"
ExecStartPre=/usr/bin/mkdir -p /etc/etcd
5 changes: 5 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
variable "container_linux_distribution" {
description = "The distribution of Container Linux ('coreos' or 'flatcar')."
default = "flatcar"
}

variable "enable_container_linux_update-engine" {
description = "Whether to enable automatic updates for Container Linux."
default = true
Expand Down

0 comments on commit 39f1361

Please sign in to comment.