summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-11-23 09:42:36 +0100
committerGitHub <noreply@github.com>2022-11-23 09:42:36 +0100
commit1bb450ef1afdba9229fbaaff8916fcad7361979e (patch)
treeec24027545ddc6e38377605e1758c763c2ba2013 /client
parente24e240f01de0c291eb62ab03718fbda6abdb1b2 (diff)
parentbad8feb2566c1d97ac7084a34b3e2c887efff103 (diff)
Merge pull request #24957 from vespa-engine/hmusum/fix-more-dirs-and-files-for-config-server
Fix files and directories in new location for ZooKeeper config [run-systemtest]
Diffstat (limited to 'client')
-rw-r--r--client/go/script-utils/configserver/fix_dirs_and_files.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/go/script-utils/configserver/fix_dirs_and_files.go b/client/go/script-utils/configserver/fix_dirs_and_files.go
index 73c4c73334e..0c0eb9af2f9 100644
--- a/client/go/script-utils/configserver/fix_dirs_and_files.go
+++ b/client/go/script-utils/configserver/fix_dirs_and_files.go
@@ -19,9 +19,11 @@ func makeFixSpec() util.FixSpec {
}
func fixDirsAndFiles(fixSpec util.FixSpec) {
- fixSpec.FixDir("conf/zookeeper")
+ fixSpec.FixDir("conf/zookeeper") // TODO: Remove when files are only written to var/zookeeper/conf
fixSpec.FixDir("var/zookeeper")
+ fixSpec.FixDir("var/zookeeper/conf")
fixSpec.FixDir("var/zookeeper/version-2")
- fixSpec.FixFile("conf/zookeeper/zookeeper.cfg")
+ fixSpec.FixFile("conf/zookeeper/zookeeper.cfg") // TODO: Remove when files are only written to var/zookeeper/conf
+ fixSpec.FixFile("var/zookeeper/conf/zookeeper.cfg")
fixSpec.FixFile("var/zookeeper/myid")
}