From b8ada0d46b9c9253a3e3bcc1cfc0d7a075f5973e Mon Sep 17 00:00:00 2001 From: Shikachuu Date: Sat, 28 Aug 2021 14:01:22 +0200 Subject: [PATCH] Changed default and fallback host_dir Have to change them since we are trying to resolve system services and the system services are in the /var/lib/faasd/hosts file instead of /var/lib/faasd-provider/hosts file. Signed-off-by: Shikachuu --- hack/faasd-provider.service | 2 +- pkg/provider/handlers/deploy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/faasd-provider.service b/hack/faasd-provider.service index 19ecced..997f7ee 100644 --- a/hack/faasd-provider.service +++ b/hack/faasd-provider.service @@ -5,7 +5,7 @@ Description=faasd-provider MemoryLimit=500M Environment="secret_mount_path={{.SecretMountPath}}" Environment="basic_auth=true" -Environment="hosts_dir=/var/lib/faasd-provider" +Environment="hosts_dir=/var/lib/faasd" ExecStart=/usr/local/bin/faasd provider Restart=on-failure RestartSec=10s diff --git a/pkg/provider/handlers/deploy.go b/pkg/provider/handlers/deploy.go index 8055a0d..3c844ab 100644 --- a/pkg/provider/handlers/deploy.go +++ b/pkg/provider/handlers/deploy.go @@ -249,7 +249,7 @@ func prepareEnv(envProcess string, reqEnvVars map[string]string) []string { func getMounts() []specs.Mount { wd, _ := os.LookupEnv("hosts_dir") if len(wd) == 0 { - wd = "/var/lib/faasd-provider" + wd = "/var/lib/faasd" } mounts := []specs.Mount{}