1
0
mirror of https://github.com/rancher/os.git synced 2025-06-24 22:11:33 +00:00
Commit Graph

20 Commits

Author SHA1 Message Date
Josh Curl
adb5635186
Support registry credentials in cloud config 2016-06-02 19:00:42 -07:00
Darren Shepherd
71c8f40ffe Merge pull request #972 from joshwget/boot-with-invalid-config
Fix boot issues due to invalid configs
2016-06-02 19:27:23 -06:00
Josh Curl
4f48569cb2
Atomic writes 2016-06-02 14:32:26 -07:00
Josh Curl
08f40ad3e7
Fix boot issues due to invalid configs 2016-06-01 18:41:55 -07:00
Josh Curl
95d8ebe146
Simplify configuration 2016-05-31 14:34:04 -07:00
Josh Curl
42e48476e7 Sync with libcompose 2016-05-23 17:21:28 -07:00
Wang Long
fa98165862 Remove -D when we set rancher.debug=false
when we set rancher.debug to true, the current code also set `-D` flag
to system-docker and user-docker daemon.
and then we change rancher.debug to false, the `-D` flag is also exist
by using command `sudo ros config get rancher.docker`.

this patch fix it.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-29 09:55:42 +08:00
Darren Shepherd
618cd741d8 Sort SSH keys from metadata so that diff functions will be consistent 2016-01-28 08:11:54 -07:00
Darren Shepherd
1a95080522 Support OEM partition and oem-config.yml 2015-12-22 17:03:50 -07:00
Ivan Mikushin
f4f59e97cc Fix naming of external services (e.g. specified by rancher.services_include)
Add container_name key to service configuration.
2015-12-21 11:49:43 +05:00
Ivan Mikushin
15ac925c50 fix CloudConfig.Merge() 2015-12-18 20:28:19 +05:00
Ivan Mikushin
5a363ab97d migrate to upstream libcompose in one and a half go 2015-12-07 18:17:57 +05:00
Wang Long
9e15059789 Replace rancherio with rancher
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2015-10-12 19:50:57 +08:00
Ivan Mikushin
338abb758f Reshuffle cloud-config
Read files cloud-config.d in alphanumeric order, then cloud-config.yml
`ros config` writes to cloud-config.yml (and cloud-config.d/private.yml - only private keys)

Add (c *CloudConfig) Save() method, use it to save the changed config

Read and apply metadata as part of LoadConfig()

Simplify ros config export logic
2015-09-30 23:59:22 +05:00
Ivan Mikushin
5934852e80 rename rancher.user_docker to rancher.docker in cloud-config 2015-09-14 11:50:39 +05:00
Ivan Mikushin
7ad60c07bd make cloud-config the configuration mechanism for RancherOS 2015-08-05 19:48:25 +05:00
Darren Shepherd
3756bbae90 Reliably merge the yaml maps data 2015-03-18 06:45:22 -07:00
Darren Shepherd
0e77cde9c0 Store server specific secrets in a separate file
TLS certs and SSH cert are stored in the rancher-private.yml file
2015-03-18 06:45:22 -07:00
Darren Shepherd
b351efa111 Read rancher.yml from cloud config 2015-03-18 06:45:22 -07:00
Darren Shepherd
ac2459ba37 Refactor configuration 2015-03-18 06:45:21 -07:00