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

296 Commits

Author SHA1 Message Date
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
Ivan Mikushin
7ad60c07bd make cloud-config the configuration mechanism for RancherOS 2015-08-05 19:48:25 +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
3223dad3b0 get services from os-services branch v0.3.2 2015-06-30 10:36:19 +05:00
Ivan Mikushin
dff70f8362 latest rancher-compose, default.go -> os-config.yml
also, gofmt
2015-06-29 12:00:41 +05:00
Ivan Mikushin
c85f9b03cd make /var/lib/rancher persistent
by making it a system volume
2015-06-09 11:59:49 +05:00
Ivan Mikushin
e69f954cf4 fix #50 2015-05-26 11:55:13 +05:00
Ivan Mikushin
95434c27de build v0.3.1 2015-05-23 20:08:48 +05:00
Ivan Mikushin
2dff031552 preload images: service dependencies
also, log implicitly added service dependencies and remove unnecessary linking to dockerwait
2015-05-22 13:29:24 +05:00
Ivan Mikushin
9a91accae9 preload images 2015-05-19 19:38:25 +05:00
Darren Shepherd
cbc9839259 Merge pull request #303 from ibuildthecloud/compose2
Update to newer compose
2015-05-11 18:01:23 -07:00
Darren Shepherd
7f4c339034 Update to newer compose 2015-05-11 01:18:42 -07:00
Ivan Mikushin
5b9ef6ae16 rename rancherctl to ros
shorter, easier to use (and just plain cooler) name
2015-05-10 18:17:04 +05:00
Darren Shepherd
f60bb0afa4 Merge pull request #293 from wlan0/bugfix2
Fix #283: Check type while setting config via rancherctl
2015-05-06 14:50:30 -07:00
Darren Shepherd
2bae134b35 Only bind mount /var/lib/rancher/conf 2015-05-05 13:37:51 -07:00
Darren Shepherd
6b929abdea Updates for refactored rancher-compose 2015-05-05 13:36:52 -07:00
wlan0
d708b7f2c1 Fix #283: Check type while setting config via rancherctl 2015-05-04 11:17:42 -07:00
Darren Shepherd
45d9c54b9a Rename userdocker to docker to be more consistent with other distros 2015-05-02 23:06:20 -07:00
Darren Shepherd
afa3c3e94a Switch to new labels syntax. Also launch acpid earlier 2015-04-30 22:16:27 -07:00
deniseschannon
0e4f0fe292 Changes required due to labels type change in ServiceConfig 2015-04-29 20:48:57 -07:00
Darren Shepherd
0d7d56e56d Merge pull request #242 from imikushin/restart-always
system services restart=always
2015-04-29 15:25:11 -07:00
wlan0
1626247f48 machine support for rancherOS 2015-04-28 10:22:13 -07:00
Ivan Mikushin
0c8896178c system services restart=always 2015-04-28 15:20:42 +05:00
Darren Shepherd
0a299fcd50 Remove trailing / 2015-04-16 07:26:42 -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
2a69c5f38e Bump version to v0.3.0-rc2 2015-04-10 07:32:32 -07:00
Darren Shepherd
894f785ac3 Don't make CA certs readonly 2015-04-10 07:28:28 -07:00
Darren Shepherd
7495f5e77f Trim whitespace for lists from rancherctl config set 2015-04-10 07:28:28 -07:00
Darren Shepherd
2fdfd56a2c Switch network container to privileged and don't use ARP 2015-04-06 15:41:48 -07:00
wlan0
7cc2eb316c use new os-base with dhcpcd 2015-04-06 15:40:59 -07:00
Darren Shepherd
bedb10c85e Rename addon to service 2015-04-06 07:28:17 -07:00
Darren Shepherd
b70373729b syslog container doesn't exist in bootstrap docker 2015-04-06 07:03:51 -07:00
Darren Shepherd
a0d3026623 Make data volume containers use json-file log driver 2015-04-06 07:02:34 -07:00
Darren Shepherd
7bb5e10b12 Add syslog and udev hotplugging 2015-04-06 06:52:17 -07:00
Darren Shepherd
02606da59f Reformat docker args 2015-04-04 18:59:13 -07:00
Darren Shepherd
1de6e898a7 setup groups and socket files on startup 2015-04-04 14:21:13 -07:00
Darren Shepherd
1d10f81ac1 Make lib/modules rw 2015-04-04 12:24:50 -07:00
Darren Shepherd
af272e92ca Add networking to system docker 2015-04-04 12:18:44 -07:00
Darren Shepherd
b47f41f96d Only bind mount in certs in userdocker 2015-04-04 10:09:17 -07:00
Darren Shepherd
36f5b16194 Add option to disable startup of services 2015-04-04 10:03:31 -07:00
Darren Shepherd
a1f912c4d5 Wait for userdocker to start 2015-04-04 09:55:41 -07:00
Darren Shepherd
ae5d41b696 Make console version different from OS version 2015-04-04 08:59:29 -07:00
Darren Shepherd
c7ae14cc13 Refactor configuration to compose syntax 2015-04-04 05:42:48 -07:00
wlan0
1dba86a97e add ipv4ll auto conf 2015-04-04 05:39:11 -07:00
Darren Shepherd
6a3240f865 Dynamically set version for ubuntu console 2015-03-20 12:43:24 -07:00
Darren Shepherd
189e40ce26 Change volume containers to create only 2015-03-20 11:37:28 -07:00
Darren Shepherd
a398f82403 Add dynamic version string 2015-03-20 11:37:28 -07:00
Darren Shepherd
9ed1f075bb Add udev as create only container in system-docker 2015-03-19 16:20:31 -07:00
Darren Shepherd
130caa1abd Add upgrade image name 2015-03-19 14:58:50 -07:00
Darren Shepherd
39fc907b8a Version 0.2.0 2015-03-18 23:04:20 -07:00
Darren Shepherd
8fca28385e Add documentation 2015-03-18 22:43:01 -07:00
Darren Shepherd
5877e586b8 Refactor default configuration 2015-03-18 06:45:22 -07: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
c737fc9a71 Read rancher.yml from the cloud config 2015-03-18 06:45:22 -07:00
Darren Shepherd
c770598a53 Add ability to tail console on startup 2015-03-18 06:45:21 -07:00
Darren Shepherd
ac2459ba37 Refactor configuration 2015-03-18 06:45:21 -07:00
Darren Shepherd
4948f952bb Switch network_config to network and config to interfaces 2015-03-18 06:45:21 -07:00
Darren Shepherd
474fb184c2 ubuntuconsole 0.0.2 2015-03-06 21:56:40 -07:00
Darren Shepherd
b62fd539bd Networking implementation and fixes 2015-03-06 21:20:46 -07:00
sidharthamani
4a94d51037 add network config command 2015-03-03 17:23:14 -08:00
Darren Shepherd
0d6ec91ab5 Pin ubuntu console version 2015-02-24 12:47:41 -07:00
Darren Shepherd
db94dfa2d1 Run cloud-init after networking 2015-02-23 14:30:51 -07:00
Darren
f6b2c8489f Merge pull request #35 from sidharthamani/master
add shutdown command
2015-02-23 12:01:15 -07:00
Darren Shepherd
dac9b7e21e Updates to cloud-init 2015-02-23 12:00:24 -07:00
sidharthamani
8181e2633a add shutdown command 2015-02-22 21:08:46 -08:00
Darren Shepherd
5876353639 Merge branch 'cloudinit' of github.com:sidharthamani/os into sidharthamani-cloudinit
Conflicts:
	scripts/dockerimages/06-console
2015-02-22 21:17:36 -07:00
Darren Shepherd
3620db959f Support reloading config during system containers start up 2015-02-22 20:59:44 -07:00
sidharthamani
d08163b5c5 lay foundation for rewriting cloud-init 2015-02-22 10:57:25 -08:00
Darren
6800fdfb67 Merge pull request #31 from sidharthamani/master
add upgrade framework for rancherctl os command
2015-02-21 19:40:44 -07:00
sidharthamani
594db8fd8c add upgrade framework for rancherctl os command 2015-02-21 12:21:56 -08:00
Darren Shepherd
d77e8f42f0 Save ssh keys 2015-02-21 00:34:38 -07:00
Darren Shepherd
4b2e98e238 Add rancher user and lock root 2015-02-20 11:29:17 -07:00
Darren Shepherd
f84aa02276 Further cleanup and refactoring 2015-02-19 20:05:43 -07:00
Darren
80dda222e2 Merge pull request #10 from sidharthamani/syslogd
Syslogd
2015-02-19 15:33:22 -07:00
Darren Shepherd
1ebf37e8be Share /home and /opt with userdocker 2015-02-19 14:34:42 -07:00
sidharthamani
ecbc0b9a05 add syslog container 2015-02-19 13:00:35 -08:00
Darren Shepherd
7fd1091b6e Refactor tlsconf 2015-02-19 13:48:10 -07:00
Darren Shepherd
ace2fa1f65 gofmt change 2015-02-19 13:47:06 -07:00
Darren Shepherd
325cbc2fe7 Merge branch 'master' of github.com:sidharthamani/os into sidharthamani-master
Conflicts:
	config/default.go
2015-02-19 11:32:09 -07:00
Darren Shepherd
045130a830 General cleanup 2015-02-19 11:27:23 -07:00
Darren Shepherd
23484e4821 Default config changes 2015-02-19 08:34:38 -07:00
sidharthamani
fb237dbebe add cloud-init support 2015-02-18 19:46:22 -08:00
sidharthamani
597a46c574 wire up tls config 2015-02-18 13:29:28 -08:00
Darren Shepherd
529ce4336d Implement rancherctl config import 2015-02-17 18:42:26 -07:00
Darren Shepherd
d26cf6485c Implement rancherctl config set 2015-02-17 17:01:38 -07:00
sidharthamani
707894d594 tls key generation 2015-02-17 15:27:13 -08:00
Darren
c3476d7b00 Merge pull request #7 from sidharthamani/ntp
add ntp container
2015-02-17 15:49:12 -07:00
sidharthamani
3092f5fcd0 add ntp container 2015-02-17 14:47:37 -08:00
Darren Shepherd
5ca7f4504d Add rancherctl to console 2015-02-17 14:35:07 -07:00
Darren Shepherd
f47ea34ac4 Refactor configuration 2015-02-17 14:31:20 -07:00
Darren Shepherd
9d8110513e Some refactoring 2015-02-17 01:18:48 -07:00
Darren Shepherd
b0c332f510 Fix more issues with state management 2015-02-16 22:27:32 -07:00
Darren Shepherd
d656da6a26 Move config to config/default.go 2015-02-16 22:08:48 -07:00
Darren Shepherd
bca7c035d2 Merge branch 'master' of github.com:sidharthamani/os into sidharthamani-master
Conflicts:
	config/config.go
2015-02-16 20:56:00 -07:00
Darren Shepherd
47a9899b89 Switch to virtio 2015-02-16 20:52:48 -07:00
Darren Shepherd
9aa9550419 Fix typo in configuration name 2015-02-16 20:48:47 -07:00
sidharthamani
56a4f96b24 add power functions - down, restart, halt 2015-02-16 17:17:43 -07:00
sidharthamani
70b376ce6a find fs type of device automatically 2015-02-16 16:44:59 -07:00
sidharthamani
34b3057909 resolve device name using libblkid 2015-02-16 16:43:58 -07:00
Darren Shepherd
925a847ccc Add tty and half way broken state handling 2015-02-16 16:38:49 -07:00
Darren Shepherd
bcf66e4c93 Refactor configuration structure 2015-02-14 09:29:07 -07:00
Darren Shepherd
df4a126175 Initial commit 2015-02-08 21:38:37 -07:00