rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-03 15:54:24 +00:00
Code Issues Releases Wiki Activity

Fix os-config.yml location

Browse Source
This commit is contained in:
Darren Shepherd
2015-08-06 00:30:20 -07:00
parent 598f47b68d
commit cc5613c64c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/types.go
View File

@@ -28,7 +28,7 @@ const (
SCOPE = "io.rancher.os.scope" SCOPE = "io.rancher.os.scope"
SYSTEM = "system" SYSTEM = "system"
OsConfigFile = "/os-config.yml" OsConfigFile = "/usr/share/ros/os-config.yml"
CloudConfigFile = "/var/lib/rancher/conf/cloud-config.yml" CloudConfigFile = "/var/lib/rancher/conf/cloud-config.yml"
CloudConfigScriptFile = "/var/lib/rancher/conf/cloud-config-script" CloudConfigScriptFile = "/var/lib/rancher/conf/cloud-config-script"
MetaDataFile = "/var/lib/rancher/conf/metadata" MetaDataFile = "/var/lib/rancher/conf/metadata"

6
os-config.yml
View File

@@ -271,8 +271,8 @@ rancher:
- /home:/home - /home:/home
- /opt:/opt - /opt:/opt
system_docker: system_docker:
args: [docker, -d, -s, overlay, -b, docker-sys, --fixed-cidr, args: [-d, -s, overlay, -b, docker-sys, --fixed-cidr, 172.18.42.1/16,
172.18.42.1/16, --restart=false, -g, /var/lib/system-docker, -G, root, --restart=false, -g, /var/lib/system-docker, -G, root,
-H, 'unix:///var/run/system-docker.sock', --userland-proxy=false] -H, 'unix:///var/run/system-docker.sock', --userland-proxy=false]
upgrade: upgrade:
url: https://releases.rancher.com/os/versions.yml url: https://releases.rancher.com/os/versions.yml
@@ -280,4 +280,4 @@ rancher:
user_docker: user_docker:
tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem, tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem,
'-H=0.0.0.0:2376'] '-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]