1
0
mirror of https://github.com/rancher/os.git synced 2025-06-30 16:51:47 +00:00
Commit Graph

368 Commits

Author SHA1 Message Date
Josh Curl
a9409dc5be Revert "Check the validity of the service name" 2016-04-11 22:06:46 -07:00
Darren Shepherd
2a99724fbf Merge pull request #862 from joshwget/network-after-cloud-init
Apply network configurations again after cloud-init
2016-04-08 14:47:28 -07:00
Josh Curl
173874f196 Apply network configurations again after cloud-init 2016-04-08 13:04:35 -07:00
Wang Long
5180c7e937 Check the validity of the service name
if user want to switch to `ubuntu-console` and type the wrong
service name `ubuntu-consile`, the command `sudo ros service enable
ubuntu-consile` run with no error. after the reboot, the console is
still the busybox console.

It is better to Warn user that the `ubuntu-consile` is no a valid
service name.

This patch also check the validity of the service name when disable and
delete service.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-08 19:05:53 +08:00
Darren Shepherd
07faa92c7f Merge pull request #820 from imikushin/kexec-kernel-args
Add --append to `ros os upgrade` to pass kernel args for --kexec
2016-04-04 13:41:11 -07:00
Josh Curl
c0c8179813 ros config get shows default values 2016-03-31 21:31:46 -07:00
Darren Shepherd
e53155d023 Merge pull request #784 from joshwget/up-to-date-upgrade-warning
Warn if upgrading to the currently running version
2016-03-31 11:51:52 -07:00
Darren Shepherd
bd13cb4f00 Merge pull request #793 from joshwget/stage-when-enabled
Stage services when they are enabled
2016-03-31 11:49:24 -07:00
Darren Shepherd
e483ade336 Merge pull request #832 from joshwget/local-upgrade-image
Only pull upgrade image if not found locally
2016-03-31 11:45:30 -07:00
Darren Shepherd
d5b33086e6 Merge pull request #840 from joshwget/delete-container-before-upgrade
Delete previous upgrade container before upgrading
2016-03-31 11:44:09 -07:00
Josh Curl
047884d4aa Delete previous upgrade container before upgrading 2016-03-29 11:53:40 -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
b965a2c0e3 Only pull upgrade image if not found locally 2016-03-28 11:27:27 -07:00
Ivan Mikushin
5a8d0e7f34 Add --append to ros os upgrade to pass kernel args for --kexec 2016-03-22 12:16:06 -07:00
Wang Long
6617eab12f print proper tips when running ros or system-docker without using sudo
`ros` and `system-docker` command requires user to be the root user,
when we running them without using sudo, it will print the follow:

[rancher@rancher ~]$ ros os list
ERRO[0000] Failed to read /var/lib/rancher/conf/cloud-config.d: open
/var/lib/rancher/conf/cloud-config.d: permission denied
ERRO[0000] Error reading config files                    err=open
/var/lib/rancher/conf/cloud-config.yml: permission denied
files=[/var/lib/rancher/conf/cloud-config.yml]
ERRO[0000] Failed [1/4] 25%
ERRO[0000] Failed to load config
......
......
FATA[0000] open /var/lib/rancher/conf/cloud-config.yml: permission
denied

and

[rancher@rancher ~]$ system-docker restart docker
Failed to kill container(docker): Cannot connect to the Docker daemon.
Is the docker daemon running on this host?

this patch make the tips more clear and simple.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-03-16 17:50:54 +08:00
Josh Curl
2f10f9052a Stage services when they are enabled 2016-02-29 19:29:07 -08:00
Josh Curl
9d46ab4df8 Kexec upgrade 2016-02-27 15:30:53 -08:00
Josh Curl
82ec567d52 Warn if upgrading to the currently running version 2016-02-27 09:00:50 -08:00
Darren Shepherd
c8f0d7cdaf Merge pull request #779 from imikushin/dry
generate os-config.yml
2016-02-26 19:00:51 -07:00
Ivan Mikushin
8b72377a3c generate os-config.yml 2016-02-26 17:46:55 -08:00
Josh Curl
6f94672044 Only run upgrade container once 2016-02-26 14:29:35 -08:00
Darren Shepherd
c7cbb1660a Merge pull request #782 from joshwget/clean-up-upgrade-container
Clean up upgrade container
2016-02-26 15:11:54 -07:00
Josh Curl
2fb203997d Clean up upgrade container 2016-02-25 14:02:58 -08:00
Josh Curl
99450ccdd4 Rename SELinux tools image 2016-02-23 08:59:58 -08:00
Josh Curl
d1abe590dd SELinux tools command 2016-02-22 21:35:15 -08:00
Darren Shepherd
b0b06558d4 Minor cleanup to not use the setsid binary 2016-02-11 09:04:35 -07:00
Darren Shepherd
f12a7c3508 Fix packet support 2016-02-09 14:04:58 -07:00
Darren Shepherd
00b7dfea1f Create directory if missing when writing network.yml 2016-02-08 21:46:17 -07:00
Ivan Mikushin
e2bab3b1f6 vendor dfs-1.10.0 go code 2016-02-04 19:23:51 -08:00
Darren Shepherd
28bd8b0ccb Fix ros dev panic 2016-02-04 09:25:36 -07:00
Darren Shepherd
4cd6d99b5e Add packet cloud config support 2016-01-28 08:11:54 -07:00
Darren Shepherd
3ee82333db Close file in wait for network 2015-12-22 08:59:35 -07:00
Ivan Mikushin
f03486263b Resolve localhost and current hostname 2015-12-11 16:44:26 +05:00
Ivan Mikushin
3e44413aa9 Default dirs for TLS cert generation
/etc/docker/tls - for server
/home/rancher/.docker - for client
2015-12-11 13:41:19 +05:00
Ivan Mikushin
6b7ddfaff2 Fix server TLS key and cert auto-generation.
To use TLS with docker, just `ros set rancher.docker.tls true` and `system-docker restart docker` (no need to restart if rancher.docker.tls is set in cloud-config on boot).
2015-12-11 13:41:18 +05:00
Darren Shepherd
23c8f5eaec Merge pull request #678 from imikushin/ros-tls-gen
fix `ros tls generate`
2015-12-09 20:40:48 -07:00
Ivan Mikushin
b757709253 fix ros tls generate
`ros tls generate -s` used to leave empty strings in rancher.docker.{ca_cert,ca_key} config keys, so the documented setup workflow would not work.
2015-12-08 18:12:01 +05:00
Ivan Mikushin
5a363ab97d migrate to upstream libcompose in one and a half go 2015-12-07 18:17:57 +05:00
Ivan Mikushin
a323c1bb02 Network: configure nameservers from DHCP and cloud-config
If dns.override is set, use dns.nameservers from cloud-config over the ones set by DHCP. To reconfigure DNS just restart the network service.
2015-12-02 20:59:06 +05:00
Ivan Mikushin
56b1aa67ac Leave dhcpcd (and netconf) running in the background.
Add wait-for-network.
2015-11-12 22:08:29 +05:00
Ivan Mikushin
c11a0739dd Merge pull request #633 from ibuildthecloud/hostname-dhcp
Set hostname prior to running DHCP
2015-11-06 09:34:53 +05:00
Ivan Mikushin
2db254865e Use a constant instead of a magic value. 2015-11-05 13:51:05 +05:00
Darren Shepherd
ea50b5968a Set hostname prior to running DHCP
https://github.com/rancher/os/issues/627
2015-11-04 16:06:17 -07:00
Ivan Mikushin
97807a52c1 Always use bundled docker for system-docker.
Fixes system-docker CLI breaking after a newer custom docker has been installed into the console container (e.g. into debian-console).
2015-11-02 14:49:29 +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
Darren Shepherd
2966ef8e5d Fix loading network files from ros service compose commands 2015-10-02 00:57:13 -07:00
Darren Shepherd
397b2a9822 Move ros compose to ros service sub commands 2015-10-01 15:48:19 -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
0ac4c783f9 Merge pull request #582 from ibuildthecloud/fix-symlink
Fix symlinking docker.dist in custom consoles
2015-09-25 00:01:47 -07:00
Darren Shepherd
427aa1f61a Fix symlinking docker.dist in custom consoles 2015-09-24 23:21:37 -07:00
Darren Shepherd
e25c59f1ab Create ros compose command 2015-09-22 11:17:15 -07:00
Darren Shepherd
a13e2957e7 Be less agressive on waiting for docker storage context container 2015-09-22 11:16:55 -07:00
Darren Shepherd
e451abd532 Merge pull request #559 from luxas/32bit
Fixed 32-bit issue in power.go
2015-09-18 15:56:14 -07:00
Ivan Mikushin
5934852e80 rename rancher.user_docker to rancher.docker in cloud-config 2015-09-14 11:50:39 +05:00
Lucas Käldström
32f71c05bf Fixed 32-bit issue. Now it is possible to build bin/rancheros on a Raspberry Pi or any 32-bit machine 2015-09-10 10:33:15 +03: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
Ivan Mikushin
94269475c2 Merge pull request #529 from ibuildthecloud/storage
Storage
2015-08-27 17:24:25 +05:00
Darren Shepherd
ab6eb58167 Run user docker with a configurable storage context 2015-08-27 02:52:12 -07:00
Ivan Mikushin
e486b7e218 ros install 2015-08-25 17:20:40 +05:00
Ivan Mikushin
ed09b30692 cloudinit: do not abort on configuration errors 2015-08-20 20:12:37 +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
Ivan Mikushin
1b327e8d7f fix user-docker 2015-08-07 00:01:57 +05:00
Darren Shepherd
9d76b79ac3 Refactor to use libcompose 2015-08-06 00:05:25 -07:00
Darren Shepherd
889c80b682 Rebase on rancher/netconf 2015-08-06 00:05:24 -07:00
Jan Broer
2b1bf67c86 Fixes runtime error when ros env is called without argument(s) 2015-08-06 01:11:22 +02: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
b7b52c65a1 ros dev spec
find device using blkid spec
2015-07-21 13:34:55 +05:00
Ivan Mikushin
4bf30683e7 build based on os-config.yml
WIP: build scripts
2015-06-29 12:03:41 +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
0d15d2b64d duplicate ssh keys into "docker" user 2015-06-12 11:31:53 +05:00
Jan Broer
4d563bf4fd cloud-init: add support for $public_IPv4, $private_IPv4, etc. substitution in the user-data 2015-05-24 19:25:58 +02:00
Jan Broer
0894639b33 Cloud-init: url and cmdline datasources require network 2015-05-14 07:51:49 +02:00
Darren Shepherd
38a38a602a Merge pull request #308 from janeczku/cloud-init-cmdline
Bugfix: cloud_init datasource "cmdline" should not expect a value
2015-05-13 20:43:03 -07:00
Jan Broer
e82ce0ac22 Bugfix: cloud_init datasource "cmdline" should not expect a value
Problem: Datasource of type `cmdline` is not processed unless a value is given. Alas, cloud-init's `proc_cmdline` method does not take any arguments at all.
2015-05-14 03:38:14 +02:00
wlan0
a748fde371 Fixes #209: ensure that service is in /var/lib/rancher/conf if specified through a file 2015-05-04 13:28:47 -07:00
Darren Shepherd
4b20a83579 Merge pull request #267 from wlan0/bugfix3
add ability to delete dynamically added services
2015-05-06 14:21:01 -07:00
wlan0
486cd66d08 Fixes #151: Better error messages for incorrect use of options 2015-05-03 22:43:38 -07:00
Darren Shepherd
420d3290c8 Add flag to not reboot after OS upgrade 2015-05-02 23:07:01 -07:00
wlan0
dcc89dfbc6 remove default directory from tls generate cmd 2015-04-29 04:38:43 -07:00
Ivan Mikushin
d62eb3de5d rancherctl env subcommand
Usage:
rancherctl env <command>

Executes <command> with environment from rancher.environment. Real env vars override those from rancher.environment.
2015-04-29 15:43:06 +05:00
wlan0
1c4765f3ba add ability to delete dynamically added services 2015-04-29 03:32:48 -07:00
wlan0
505174db35 set hostname from cloud-init 2015-04-21 19:06:40 -07:00
Darren Shepherd
2462067015 Properly marshall #compose and script files in cloud-config.d 2015-04-17 06:37:56 -07:00
Bill Maxwell
1ab2b502dd Needed to add a newline. 2015-04-16 22:56:55 -07:00
Darren Shepherd
ae0c42cef3 Fix broken OS upgrade 2015-04-16 12:04:14 -07:00
Darren Shepherd
0b5eb352ba Services in compose format 2015-04-15 23:17:01 -07:00
Darren Shepherd
b1c519ebe0 Force os-installer container to use json-file logger 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
6bb6fb0eec Support cloud-config.d 2015-04-15 23:17:00 -07:00
Darren Shepherd
e0820d240f Rename files 2015-04-15 23:17:00 -07:00
Darren Shepherd
0abe9f995a Merge pull request #163 from deniseschannon/master
Update os.go
2015-04-15 02:42:38 -07:00
Denise
4c37d94aab Update os.go 2015-04-13 11:46:38 -07:00
Dan Arnould
3bc8f95639 Add 'rancherctl os version' command 2015-04-11 16:40:42 +01:00
Bill Maxwell
33a19f7ac1 added google cloud config 2015-04-10 09:13:09 -07:00
Darren Shepherd
b6d3b1bccb Fix rancherctl service enable/list 2015-04-10 07:28:28 -07:00
Darren Shepherd
106fb36c8c Set hostname from DHCP (broken)
This adds the proper variable we need to set the hostname from DHCP. End
to end this does not work though.  The hostname does not propagate
outside the container.  More changes need to be done for this.
2015-04-10 07:28:28 -07:00
Ivan Mikushin
8e9368b6a3 cloud-config write_files should write to absolute path 2015-04-09 20:01:09 +05:00
Darren Shepherd
43e3d380f4 Attempt to set hostname from DHCP 2015-04-07 20:06:43 -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
af272e92ca Add networking to system docker 2015-04-04 12:18:44 -07:00
Darren Shepherd
a1f912c4d5 Wait for userdocker to start 2015-04-04 09:55:41 -07:00
Darren Shepherd
c7ae14cc13 Refactor configuration to compose syntax 2015-04-04 05:42:48 -07:00
Darren Shepherd
38389b1f8e Add digitalocean cloud-init datasource 2015-04-04 05:39:11 -07:00
wlan0
1dba86a97e add ipv4ll auto conf 2015-04-04 05:39:11 -07:00
Darren Shepherd
6ce39f7c66 Merge pull request #112 from wlan0/netconf
match network interfaces by MAC addresses
2015-03-27 18:48:01 -07:00
Bill Maxwell
c4ca06fb8c Make the post hook use the system docker
When booting, if the network doesn't come up or the post hook is
needed to complete bringing up the network, you need access to the
baked in images.
2015-03-27 15:58:07 -07:00
wlan0
a6415394af match network interfaces by MAC addresses 2015-03-25 18:10:44 -07:00
Darren Shepherd
0aeda8d1b0 Add prompting to reboot 2015-03-20 11:37:28 -07:00
Darren Shepherd
a051b1ad70 Reboot after os upgrade 2015-03-19 15:36:40 -07:00
Darren Shepherd
932709e3ba Add logging and -f to upgrade 2015-03-19 14:58:50 -07:00
Darren Shepherd
5877e586b8 Refactor default configuration 2015-03-18 06:45:22 -07:00
Darren Shepherd
91dd56e595 Add bootstrap phase to handle udev and auto-format 2015-03-18 06:45:22 -07:00
Darren Shepherd
dd429b3010 respawn: Fix broken log message 2015-03-18 06:45:22 -07:00
Darren Shepherd
63a1c50f27 Refactor TLS command 2015-03-18 06:45:22 -07:00
Darren Shepherd
e143d04885 Refactor network config to put that match as the key 2015-03-18 06:45:21 -07:00
Darren Shepherd
bffd9865ea OS upgrade and list 2015-03-18 06:45:21 -07:00
Darren Shepherd
c8a9b14338 Support pulling rancher config from cloud config 2015-03-18 06:45:21 -07:00
Darren Shepherd
444e8cf9a2 Refactor tls command 2015-03-18 06:45:21 -07:00
Darren Shepherd
c770598a53 Add ability to tail console on startup 2015-03-18 06:45:21 -07:00
Darren Shepherd
7baf6fc74c Handle SIGTERM in respawn 2015-03-18 06:45:21 -07:00
Darren Shepherd
c0b02ca361 More graceful shutdown and sync before syscall 2015-03-18 06:45:21 -07:00
Darren Shepherd
ac2459ba37 Refactor configuration 2015-03-18 06:45:21 -07:00
Darren Shepherd
0f8eb3e21d Fix typos in addon help messages 2015-03-18 06:45:21 -07:00
Bill Maxwell
ede9b0100e fixed whitespace in help 2015-03-10 21:54:02 -07:00
Darren Shepherd
c837a2ae59 Fix console reboot 2015-03-06 21:20:59 -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
e5192ddc5e Change reboot error messages and timeout 2015-02-23 14:52:11 -07:00
Darren
f6b2c8489f Merge pull request #35 from sidharthamani/master
add shutdown command
2015-02-23 12:01:15 -07:00
Darren Shepherd
1c5ac9f410 gofmt 2015-02-23 12:00:33 -07:00
Darren Shepherd
dac9b7e21e Updates to cloud-init 2015-02-23 12:00:24 -07:00
Darren Shepherd
5d2d23d988 Log update-ssh-keys to stdout/stderr 2015-02-23 11:58:43 -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
Darren Shepherd
b0046e8e08 setsid in respawn 2015-02-22 20:59:44 -07:00
Darren Shepherd
c0cee91cd1 Add addon to rancherctl 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
0b31dc7e3b move tlsconf to rancherctl 2015-02-21 13:42:42 -08:00
sidharthamani
33d636930b refactor power and check for permissions 2015-02-21 12:22:59 -08:00
sidharthamani
594db8fd8c add upgrade framework for rancherctl os command 2015-02-21 12:21:56 -08:00
Darren Shepherd
dc59b3c724 Cleanup logging 2015-02-21 00:34:23 -07:00
Darren Shepherd
d63c875d13 Don't print reboot message 2015-02-21 00:34:01 -07:00
sidharthamani
7c44ed3e58 sync file system before making power syscalls 2015-02-20 10:48:18 -08:00
Darren Shepherd
7f3ee5d9ef Small cloud init fixes 2015-02-20 09:18:55 -07:00
Darren Shepherd
f84aa02276 Further cleanup and refactoring 2015-02-19 20:05:43 -07:00
Darren Shepherd
e211279636 Refactor cloud-init 2015-02-19 20:05:17 -07:00
Darren Shepherd
a076a3c5f2 Fix cloudinit compilation 2015-02-19 14:43:37 -07:00
Darren Shepherd
e8abf31e94 Check that docker wait exits with 0 2015-02-19 14:16:26 -07:00
Darren Shepherd
fb8b4a88fb Move sysinit to cmd 2015-02-19 13:58:29 -07:00
Darren Shepherd
81e15fc46f Move power to cmd 2015-02-19 13:56:33 -07:00
Darren Shepherd
6e2a532c10 Move respawn to cmd 2015-02-19 13:53:52 -07: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
sidharthamani
fb237dbebe add cloud-init support 2015-02-18 19:46:22 -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
Darren Shepherd
31201786cd Cleanup rancherctl config get code 2015-02-17 17:01:38 -07:00
Darren Shepherd
e877d5804f Implement rancherctl config get 2015-02-17 15:32:15 -07:00
Darren Shepherd
d3b42ca16c Implement config export 2015-02-17 14:31:37 -07:00
Darren Shepherd
f47ea34ac4 Refactor configuration 2015-02-17 14:31:20 -07:00
Darren Shepherd
11a11ca3d1 Update godeps 2015-02-17 14:30:18 -07:00