Skip to content

ETCD-356: Changing etcd data directory to /var/lib/etcd #1178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dusk125 wants to merge 1 commit into from
Closed

ETCD-356: Changing etcd data directory to /var/lib/etcd #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/install-microshift/files/etcd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion etcd/cmd/microshift-etcd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down