mirror of
https://github.com/rancher/os.git
synced 2025-08-31 14:23:11 +00:00
Fix os-config.yml location
This commit is contained in:
@@ -28,7 +28,7 @@ const (
|
||||
SCOPE = "io.rancher.os.scope"
|
||||
SYSTEM = "system"
|
||||
|
||||
OsConfigFile = "/os-config.yml"
|
||||
OsConfigFile = "/usr/share/ros/os-config.yml"
|
||||
CloudConfigFile = "/var/lib/rancher/conf/cloud-config.yml"
|
||||
CloudConfigScriptFile = "/var/lib/rancher/conf/cloud-config-script"
|
||||
MetaDataFile = "/var/lib/rancher/conf/metadata"
|
||||
|
@@ -271,8 +271,8 @@ rancher:
|
||||
- /home:/home
|
||||
- /opt:/opt
|
||||
system_docker:
|
||||
args: [docker, -d, -s, overlay, -b, docker-sys, --fixed-cidr,
|
||||
172.18.42.1/16, --restart=false, -g, /var/lib/system-docker, -G, root,
|
||||
args: [-d, -s, overlay, -b, docker-sys, --fixed-cidr, 172.18.42.1/16,
|
||||
--restart=false, -g, /var/lib/system-docker, -G, root,
|
||||
-H, 'unix:///var/run/system-docker.sock', --userland-proxy=false]
|
||||
upgrade:
|
||||
url: https://releases.rancher.com/os/versions.yml
|
||||
@@ -280,4 +280,4 @@ rancher:
|
||||
user_docker:
|
||||
tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem,
|
||||
'-H=0.0.0.0:2376']
|
||||
args: [docker, -d, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]
|
||||
args: [-d, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]
|
||||
|
Reference in New Issue
Block a user