X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/22cff6bb354d6980c33a0f471d5860f968e853a6..84c753c29346450bae7efd8f8bcd11aa7ea71109:/lib/config/load.go diff --git a/lib/config/load.go b/lib/config/load.go index 61d80a3c58..21d1722737 100644 --- a/lib/config/load.go +++ b/lib/config/load.go @@ -37,6 +37,7 @@ type Loader struct { WebsocketPath string KeepproxyPath string GitHttpdPath string + KeepBalancePath string configdata []byte } @@ -69,6 +70,7 @@ func (ldr *Loader) SetupFlags(flagset *flag.FlagSet) { flagset.StringVar(&ldr.WebsocketPath, "legacy-ws-config", defaultWebsocketConfigPath, "Legacy arvados-ws configuration `file`") flagset.StringVar(&ldr.KeepproxyPath, "legacy-keepproxy-config", defaultKeepproxyConfigPath, "Legacy keepproxy configuration `file`") flagset.StringVar(&ldr.GitHttpdPath, "legacy-git-httpd-config", defaultGitHttpdConfigPath, "Legacy arv-git-httpd configuration `file`") + flagset.StringVar(&ldr.KeepBalancePath, "legacy-keepbalance-config", defaultKeepBalanceConfigPath, "Legacy keep-balance configuration `file`") flagset.BoolVar(&ldr.SkipLegacy, "skip-legacy", false, "Don't load legacy config files") } @@ -149,6 +151,9 @@ func (ldr *Loader) MungeLegacyConfigArgs(lgr logrus.FieldLogger, args []string, if legacyConfigArg != "-legacy-git-httpd-config" { ldr.GitHttpdPath = "" } + if legacyConfigArg != "-legacy-keepbalance-config" { + ldr.KeepBalancePath = "" + } return munged } @@ -252,6 +257,7 @@ func (ldr *Loader) Load() (*arvados.Config, error) { ldr.loadOldWebsocketConfig(&cfg), ldr.loadOldKeepproxyConfig(&cfg), ldr.loadOldGitHttpdConfig(&cfg), + ldr.loadOldKeepBalanceConfig(&cfg), } { if err != nil { return nil, err