rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-15 07:41:39 +00:00
Code Issues Releases Wiki Activity
1,041 Commits 23 Branches 183 Tags 80 MiB
50de80d09a
Commit Graph

181 Commits

Author SHA1 Message Date
Josh Curl
c18cd26e78 Update codegangsta/cli action return signature 2016-05-23 17:22:07 -07:00
Josh Curl
b2ab4d0c38 Use Docker exec to start User Docker 2016-05-23 17:21:35 -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
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
Josh Curl
a0ae6222c9 Fix DHCP hostname being overwritten 2016-04-14 21:58:07 -07:00
Darren Shepherd
dcba30813c Merge pull request #875 from joshwget/fix-dns-override 
If DNS override is set, pass `--nohook resolv.conf` to dhcpd
 2016-04-12 10:14:36 -07:00
Darren Shepherd
0c4057346a Merge pull request #876 from rancher/revert-870-check-validity-of-service-name 
Revert "Check the validity of the service name"
 2016-04-12 10:02:08 -07:00
Josh Curl
60ecf3d547 If DNS override is set, pass --nohook resolv.conf to dhcpd 2016-04-12 09:57:14 -07:00
Josh Curl
97774f78a9 Remove --boot flag in ros config export 2016-04-11 22:07:59 -07:00
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