1
0
mirror of https://github.com/rancher/os.git synced 2025-09-17 23:48:09 +00:00
Commit Graph

63 Commits

Author SHA1 Message Date
Wang Long
db49753d1a do not print success info when loading images error
when the client.LoadImage return an error, there should not be print
success info like the following:

    "INFO[0000] Done loading images from /usr/share/ros/images.tar"

This patch fix it by move the log.Infof() after the err check.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-02-03 20:24:12 +08:00
Darren Shepherd
7e4f8fe87d Merge pull request #704 from ibuildthecloud/one
Remove unneeded code
2015-12-22 17:12:19 -07:00
Darren Shepherd
ee257f944e Remove unneeded code 2015-12-22 17:11:25 -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
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
Darren Shepherd
2966ef8e5d Fix loading network files from ros service compose commands 2015-10-02 00:57:13 -07: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
Darren Shepherd
3a3270f2c6 Fix systemd emulation 2015-09-18 22:27:53 -07:00
Ivan Mikushin
65da0341eb Fix mounting /usr filesystem in non-dev RancherOS versions 2015-09-01 12:16:38 +05:00
Darren Shepherd
0f1b7741d7 Fix setting up state partition 2015-08-28 21:17:30 -07: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
aa1af05d46 do not panic 2015-08-20 18:06:48 +05: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
Ivan Mikushin
7ad60c07bd make cloud-config the configuration mechanism for RancherOS 2015-08-05 19:48:25 +05:00
Ivan Mikushin
ca54b617a0 try mount state
run bootstrap if failed (and autoformat if we can), then try again
2015-07-22 21:14:39 +05:00
Ivan Mikushin
890052273e log bootstrap and autoformat services 2015-07-22 19:18:43 +05:00
Ivan Mikushin
a636157882 only run bootstrap (including auto-formatter) if we can not resolve state drive 2015-07-22 18:44:56 +05:00
Ivan Mikushin
d33698d17b move auto-formatter drive selection logic to os-autoformat container
and get rid of:
- machine-rancheros.iso,
- special case in build-images,
- some bootstrap.go code
2015-07-22 17:47:24 +05:00
Ivan Mikushin
ad832471a1 isolate and mark platform dependent code
now unit tests compile on OS X and (some of them) work
2015-07-17 16:43:09 +05:00
Ivan Mikushin
e8513c8e97 fix machine 2015-07-02 14:06:12 +05:00
Ivan Mikushin
dff70f8362 latest rancher-compose, default.go -> os-config.yml
also, gofmt
2015-06-29 12:00:41 +05:00
Darren Shepherd
7f4c339034 Update to newer compose 2015-05-11 01:18:42 -07:00
Darren Shepherd
6b929abdea Updates for refactored rancher-compose 2015-05-05 13:36:52 -07:00
Darren Shepherd
375fcd0787 Merge pull request #270 from ibuildthecloud/stuff
Manual merge of PR 255
2015-05-01 11:58:38 -07:00
deniseschannon
0e4f0fe292 Changes required due to labels type change in ServiceConfig 2015-04-29 20:48:57 -07:00
wlan0
81040243d7 Fix #253: Do not fail boot if module cannot be loaded 2015-04-29 03:13:59 -07:00
wlan0
bc9efaa22d make modules settable through rancherctl config 2015-04-28 18:38:15 -07:00
wlan0
1626247f48 machine support for rancherOS 2015-04-28 10:22:13 -07:00
Darren Shepherd
9116652561 Fix autoformat 2015-04-20 16:58:55 -07:00
Darren Shepherd
0b5eb352ba Services in compose format 2015-04-15 23:17:01 -07:00
Darren Shepherd
be8fa8e5b7 Services as compose format 2015-04-15 23:17:00 -07:00
Darren Shepherd
bedb10c85e Rename addon to service 2015-04-06 07:28:17 -07:00
Darren Shepherd
1de6e898a7 setup groups and socket files on startup 2015-04-04 14:21:13 -07:00
Darren Shepherd
af272e92ca Add networking to system docker 2015-04-04 12:18:44 -07:00
Darren Shepherd
96dff754c4 Rebase to disable 2015-04-04 10:10:04 -07:00
Darren Shepherd
8dad5598b5 Change boot up message 2015-04-04 05:42:48 -07:00
Darren Shepherd
c7ae14cc13 Refactor configuration to compose syntax 2015-04-04 05:42:48 -07:00
Darren Shepherd
e34c3a5e2d Create but do not start udev on system-docker
Eventually this container will be replaced with udev hotplug
2015-03-19 14:58:50 -07:00
Darren Shepherd
4e668e6e30 Don't symlink docker location, store at /var/lib/[system-]docker 2015-03-19 11:41:47 -07:00
Darren Shepherd
91dd56e595 Add bootstrap phase to handle udev and auto-format 2015-03-18 06:45:22 -07:00
Darren Shepherd
ac2459ba37 Refactor configuration 2015-03-18 06:45:21 -07:00
Darren Shepherd
dfeb26eecf Temporary fix for VMware mounting state partition 2015-02-24 10:45:17 -07:00
Darren Shepherd
dc59b3c724 Cleanup logging 2015-02-21 00:34:23 -07:00