1
0
mirror of https://github.com/rancher/os.git synced 2025-08-02 07:24:28 +00:00
Commit Graph

155 Commits

Author SHA1 Message Date
Darren Shepherd
c94f2451d4 Merge pull request #897 from datawolf/fix-set-rancher.debug-error
Remove `-D` when we set rancher.debug=false
2016-05-02 13:24:32 -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
f15967a7a3 Merge pull request #890 from joshwget/add-upgrade-console-flag
Add upgrade flag to upgrade persistent console
2016-04-25 10:50:37 -07:00
Josh Curl
ee73337f49 Add upgrade flag to upgrade persistent console 2016-04-18 17:00:18 -07:00
Josh Curl
8862878337 Remove DHCP override flag 2016-04-15 10:38:31 -07:00
Darren Shepherd
8b4e6cc502 Merge pull request #881 from joshwget/fix-dhcp-hostname
Fix DHCP hostname being overwritten
2016-04-14 21:59:38 -07:00
Josh Curl
a0ae6222c9 Fix DHCP hostname being overwritten 2016-04-14 21:58:07 -07:00
Josh Curl
53acef17cd Use yaml.Unmarshal to handle config arguments 2016-04-14 17:04:00 -07:00
Josh Curl
b52663ee5f Fix config/config_test.go 2016-04-13 10:26:41 -07:00
Josh Curl
97774f78a9 Remove --boot flag in ros config export 2016-04-11 22:07:59 -07:00
Josh Curl
8f6ee9ee05 Revert "Use yaml.Unmarshal to handle config arguments" 2016-04-05 10:00:12 -07:00
Josh Curl
c0c8179813 ros config get shows default values 2016-03-31 21:31:46 -07:00
Darren Shepherd
c459937d90 Merge pull request #834 from joshwget/unmarshal-args-as-yaml
Use yaml.Unmarshal to handle config arguments
2016-03-31 11:44:44 -07:00
Ivan Mikushin
ee9c21c5f1 Use docker images for the current architecture (vs just for amd64)
Fix #828, #835
2016-03-29 10:29:56 -07:00
Josh Curl
6e6233bd86 Use yaml.Unmarshal to handle config arguments 2016-03-28 16:36:59 -07:00
Darren Shepherd
6f98e06d97 Fix ros config set for list values 2016-02-11 09:25:48 -07:00
Darren Shepherd
ce915927be Fix issue with depulicate ssh keys after save
The CloudConfig.Save() did not load the metadata resulting in the diff
function always thinking the SSH keys were new.  This would cause them
to be saved over and over again just getting bigger and bigger.
2016-02-04 09:13:20 -07:00
Darren Shepherd
2cbde58c30 Revert "Remove unused SshConfig type"
This reverts commit 246791d325.
2016-01-28 08:27:17 -07: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
4cd6d99b5e Add packet cloud config support 2016-01-28 08:11:54 -07:00
Darren Shepherd
af0bd7d36b Add mdadm scan flag and state script 2015-12-22 18:14:07 -07:00
Darren Shepherd
1a95080522 Support OEM partition and oem-config.yml 2015-12-22 17:03:50 -07:00
Darren Shepherd
cd2829d220 Farewell PID one
This change no longer runs Docker as PID 1.  Instead PID 1 is a very
simple zombie reaper and Docker is moved as a child of that PID.
2015-12-22 15:38:32 -07:00
Darren Shepherd
808fbdbe1f Use a subdirectory of the state partition 2015-12-22 15:16:22 -07:00
Darren Shepherd
40c861d0d1 Merge pull request #696 from ibuildthecloud/ssh
Remove unused SshConfig type
2015-12-21 10:09:58 -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
Darren Shepherd
246791d325 Remove unused SshConfig type 2015-12-20 23:33:15 -07:00
Ivan Mikushin
15ac925c50 fix CloudConfig.Merge() 2015-12-18 20:28:19 +05:00
Ivan Mikushin
66ba159482 Pre-process YAML config data
Stringify libcompose datatypes' leaf values to avoid unmarshaling errors, even on somewhat incorrect input data: like using bools or numerics in labels.
2015-12-07 23:30:16 +05:00
Ivan Mikushin
5a363ab97d migrate to upstream libcompose in one and a half go 2015-12-07 18:17:57 +05:00
Darren Shepherd
66432c6454 Merge pull request #629 from imikushin/separate-system-docker
Always use bundled docker for system-docker.
2015-11-05 16:07:15 -07:00
Ivan Mikushin
2db254865e Use a constant instead of a magic value. 2015-11-05 13:51:05 +05:00
Wang Long
474246aa70 Delete the unused ContainerConfig type
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2015-11-01 20:32:11 +08:00
Wang Long
dc33d84a48 config/types.go: add "" to field tag
The field tag format accepted is[1]:
    `(...) yaml:"[<key>][,<flag1>[,<flag2>]]" (...)`
so we should add double quotation marks for the
filed tag format.

[1]: https://godoc.org/gopkg.in/yaml.v2

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2015-10-31 23:54:56 +08:00
Ivan Mikushin
44b705c525 Merge pull request #597 from imikushin/usr-dev
remove boot behaviour dependency on version string
2015-10-13 11:13:31 +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
c79a64e42e remove dependency on version string
using rancher.rm_usr kernel param instead
2015-10-07 14:02:17 +05: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
Darren Shepherd
72be1d11e6 Revert "Revert "Storage""
This reverts commit 7b2bf93271.
2015-08-27 12:24:26 -07:00
Ivan Mikushin
7b2bf93271 Revert "Storage" 2015-08-27 18:33:26 +05:00
Darren Shepherd
ab6eb58167 Run user docker with a configurable storage context 2015-08-27 02:52:12 -07:00
Ivan Mikushin
0de6eb94a5 rm users from our cloud-config
at least, for now
2015-08-22 00:16:15 +05:00
Ivan Mikushin
4d6530be73 slices union and intersection
useful for merging and splitting configs
2015-08-21 17:07:45 +05:00
Ivan Mikushin
642c557c73 do not save/use bad cloud-config 2015-08-20 19:20:51 +05:00
Ivan Mikushin
aa1af05d46 do not panic 2015-08-20 18:06:48 +05:00
Darren Shepherd
cc5613c64c Fix os-config.yml location 2015-08-06 00:30:20 -07:00
Darren Shepherd
9d76b79ac3 Refactor to use libcompose 2015-08-06 00:05:25 -07:00
Darren Shepherd
19f9a1b281 Rebase on docker-from-scratch 2015-08-06 00:05:25 -07:00
Darren Shepherd
889c80b682 Rebase on rancher/netconf 2015-08-06 00:05:24 -07:00