1
0
mirror of https://github.com/rancher/os.git synced 2025-08-01 06:59:05 +00:00
Commit Graph

164 Commits

Author SHA1 Message Date
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