From 6c8dbf3a22b057383e9f4ada7740056feed6e551 Mon Sep 17 00:00:00 2001 From: Allen Ray Date: Wed, 7 Dec 2022 16:01:16 -0500 Subject: [PATCH] ETCD-356: Changing etcd data directory to /var/lib/etcd --- ansible/roles/install-microshift/files/etcd.service | 2 +- etcd/cmd/microshift-etcd/run.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/install-microshift/files/etcd.service b/ansible/roles/install-microshift/files/etcd.service index 2b91a383cc..17e8c8bebf 100644 --- a/ansible/roles/install-microshift/files/etcd.service +++ b/ansible/roles/install-microshift/files/etcd.service @@ -7,7 +7,7 @@ Wants=network-online.target local-fs.target remote-fs.target time-sync.target [Service] User=root Type=notify -Environment=ETCD_DATA_DIR=/var/lib/microshift +Environment=ETCD_DATA_DIR=/var/lib/etcd Environment=ETCD_NAME=%m ExecStart=/usr/bin/etcd \ --cert-file=${ETCD_DATA_DIR}/resources/kube-apiserver/secrets/etcd-client/tls.crt \ diff --git a/etcd/cmd/microshift-etcd/run.go b/etcd/cmd/microshift-etcd/run.go index a9017d2c61..215c06f7d1 100644 --- a/etcd/cmd/microshift-etcd/run.go +++ b/etcd/cmd/microshift-etcd/run.go @@ -61,7 +61,7 @@ func (s *EtcdService) configure(cfg *config.MicroshiftConfig) { etcdServingCertDir := cryptomaterial.EtcdServingCertDir(certsDir) etcdPeerCertDir := cryptomaterial.EtcdPeerCertDir(certsDir) etcdSignerCertPath := cryptomaterial.CACertPath(cryptomaterial.EtcdSignerDir(certsDir)) - dataDir := filepath.Join(microshiftDataDir, s.Name()) + dataDir := filepath.Join("/var/lib", s.Name()) // based on https://github.com/openshift/cluster-etcd-operator/blob/master/bindata/bootkube/bootstrap-manifests/etcd-member-pod.yaml#L19 s.etcdCfg = etcd.NewConfig()