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

321 Commits

Author SHA1 Message Date
Serhiy Berezin
de1bbbea38 Merge https://github.com/rancher/os into HEAD 2016-12-02 01:17:16 +00:00
Serhiy Berezin
3cc41b0a98 ALL top level cloud-config keys as kernel args work now if prefixed with "cc.", while prefixed just with "rancher." works as well for legacy backward compat 2016-12-02 01:16:42 +00:00
Josh Curl
be5d207d5d
Show SSH keys and hostname from metadata in 'ros config export' 2016-11-30 16:41:58 -08:00
Sven Dowideit
4df962d4b6 make ros log to dmesg
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-11-30 10:51:30 +10:00
Josh Curl
20856a4171
Fix golint error 2016-11-29 14:38:47 -08:00
Josh Curl
a7c34b9855
Fix golint errors 2016-11-28 00:06:00 -08:00
Josh Curl
f6ba07bf8b
Fix validation for list of maps 2016-11-26 23:27:42 -08:00
Josh Curl
47a447cb67
Add container to write_files schema 2016-11-26 23:26:20 -08:00
Josh Curl
1d617f1b92
Remove empty Docker engine arguments 2016-11-21 15:18:44 -08:00
Josh Curl
98f7f9e207
Update schema 2016-11-16 21:02:33 -08:00
Darren Shepherd
4479ff5cdb Merge pull request #1364 from joshwget/early-cloud-init
Early cloud-init
2016-11-16 17:05:03 -07:00
Josh Curl
ac3cd213dc
Update schema 2016-11-16 10:06:13 -08:00
Sven Dowideit
8cc4850fe0 Merge pull request #1379 from joshwget/add-insecure-registry-flag
Add --insecure-registry flag to daemon arguments
2016-11-15 10:10:27 +10:00
Josh Curl
4ca24cffc6
Add bootcmd to schema 2016-11-11 14:56:25 -08:00
Sven Dowideit
28075b2a78 Merge pull request #1373 from joshwget/validate-command
Add command to validate configuration
2016-11-10 18:34:14 +10:00
Josh Curl
5fe26f3ab5
Add --insecure-registry flag to daemon arguments 2016-11-09 11:36:51 -08:00
Josh Curl
13b34a6668
Early cloud-init 2016-11-09 11:08:30 -08:00
Josh Curl
1f1c56d0ec
Add unit test that covers entire configuration 2016-11-08 11:48:45 -08:00
Josh Curl
ceaec960c4
Update schema 2016-11-08 11:48:05 -08:00
Josh Curl
c1abc67fa8
Support string values for runcmd 2016-11-07 11:36:37 -08:00
Josh Curl
25e5ca5e4c
Add command to validate configuration 2016-11-06 18:23:01 -08:00
Josh Curl
bb4ad618e1
Implement bootcmd 2016-11-03 15:06:20 -07:00
Josh Curl
57018249a6
Change host engine opt type to list 2016-10-30 12:07:55 -07:00
Josh Curl
7dce4d54c1
Support list types for engine opts 2016-10-29 21:22:53 -07:00
Josh Curl
5ecbf19aa8 Merge pull request #1332 from joshwget/move-in-netconf-and-dfs
Move in code from netconf and docker-from-scratch
2016-10-19 17:56:30 -07:00
Josh Curl
691f7cb42c
Move in code from netconf and docker-from-scratch 2016-10-19 16:21:35 -07:00
Josh Curl
a7d405991c
Rewrite a few scripts in Go and remove unneeded services 2016-10-17 14:47:44 -07:00
Josh Curl
7adb6ee3a8
Add omitempty to EngineOpts tags 2016-09-29 21:47:31 -07:00
Darren Shepherd
5987d713a4 Merge pull request #1245 from joshwget/parse-colons-without-quotes
Colons can be parsed without quotes
2016-09-26 21:41:57 -07:00
Darren Shepherd
e5293ff926 Merge pull request #1239 from joshwget/docker-arguments-map
Use a map to configure Docker arguments
2016-09-26 21:36:36 -07:00
Josh Curl
b65e429bb6
Run gofmt and fix vet errors 2016-09-26 21:32:37 -07:00
Josh Curl
065fe4a16e
Use a map to configure Docker arguments 2016-09-25 17:55:19 -07:00
Josh Curl
133c2610d1
Remove rancher.state.formatzero kernel parameter 2016-09-25 11:39:46 -07:00
Josh Curl
c1582f5a49
Colons can be parsed without quotes 2016-09-18 16:35:32 -07:00
Josh Curl
2781eab500
Split up parseCmdline unit test 2016-09-18 16:33:22 -07:00
Josh Curl
4677af8419
Implement runcmd 2016-08-22 13:22:27 -07:00
Josh Curl
11cf2a195b
Show current/enabled/disabled in 'ros engine list' 2016-08-17 16:33:49 -07:00
Josh Curl
80c72d0761
Make it easier to switch between Docker engines 2016-08-15 15:06:26 -07:00
Josh Curl
0a053c62ab
Extend write_files to run in all system services 2016-08-15 11:14:50 -07:00
Josh Curl
c67475cbaa
Rewrite console.sh and docker-init in Go 2016-08-12 11:40:56 -07:00
Josh Curl
6b4222888c
Refactor state 2016-07-27 23:25:08 -07:00
Ivan Mikushin
22887dfb0b Unescape kernel params
so kernel params like rancher.cloud_init.datasources='["url:http://10.0.2.2:8800/cc.yml"]' could be used
2016-07-15 15:03:17 -07:00
Ivan Mikushin
b6edde6052 Do not lose ssh keys from metadata if there are no ssh keys in cloud-config 2016-06-30 14:21:41 -07:00
Josh Curl
b09c09edf4
Fix two instances where customization isn't respected 2016-06-28 14:35:51 -07:00
Josh Curl
921c00c8ea
Add sysctl support in cloud config 2016-06-17 23:05:45 -07:00
Josh Curl
07cc5a430a
Make rancher.debug control bootstrap Docker and turn on log 2016-06-17 09:41:33 -07:00
Josh Curl
f850e151de
Validate value for 'ros config set' 2016-06-16 10:14:52 -07:00
Darren Shepherd
924e4b8aae /media and /mnt mounted as shared for console 2016-06-15 16:45:05 -07:00
Josh Curl
f24facc06c
Additional mounts can be set in cloud config 2016-06-14 15:25:56 -07:00
Josh Curl
7f7d8765ca
New console label to handle switching between persistent consoles 2016-06-10 10:54:10 -07:00
Josh Curl
9658d3bffd
Replace resize system service with cloud config option 2016-06-07 09:53:41 -07:00
Josh Curl
719d255636
First class consoles 2016-06-06 15:13:15 -07:00
Darren Shepherd
8ab32c820f Docker 1.11.1 2016-06-03 11:38:25 -07:00
Josh Curl
adb5635186
Support registry credentials in cloud config 2016-06-02 19:00:42 -07:00
Darren Shepherd
4ab3162ed8 Merge pull request #973 from joshwget/remove-unneeded-code
Remove unneeded service processing code
2016-06-02 19:28:17 -06: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
Darren Shepherd
5659173628 Merge pull request #962 from joshwget/atomic-writes
Atomic writes
2016-06-02 19:26:44 -06:00
Josh Curl
4f48569cb2
Atomic writes 2016-06-02 14:32:26 -07:00
Josh Curl
55d629b980
Remove unneeded service processing code 2016-06-02 09:01:00 -07:00
Josh Curl
08f40ad3e7
Fix boot issues due to invalid configs 2016-06-01 18:41:55 -07:00
Josh Curl
e51c5409aa
Move default hostname and network under common key 2016-05-31 22:27:04 -07:00
Josh Curl
a59ec33787
Fix --private flag for 'ros config export' 2016-05-31 18:10:56 -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
Darren Shepherd
cd84bd8cf6 Merge pull request #896 from joshwget/ros-config-set-default-value
Fix setting default values with 'ros config set'
2016-05-02 13:24:54 -07:00
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
6ab32ae19c Fix setting default values with 'ros config set' 2016-04-22 16:11:54 -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
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