1
0
mirror of https://github.com/rancher/os.git synced 2025-07-01 09:11:48 +00:00
Commit Graph

102 Commits

Author SHA1 Message Date
Ivan Mikushin
41f333d0ff Disable docker server TLS cert auto-generation
Because users should be explicit about their docker TLS certs.
Also, re-generate the key and cert files when `ros tls gen` is run (used to be cached).
2016-06-06 10:27:03 -07:00
Darren Shepherd
7c6fa3f0b6 Merge pull request #955 from imikushin/upgrade-flow
ros os upgrade: ask for confirmation first, then download and upgrade
2016-06-02 20:15:37 -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
Josh Curl
4f48569cb2
Atomic writes 2016-06-02 14:32:26 -07:00
Josh Curl
08f40ad3e7
Fix boot issues due to invalid configs 2016-06-01 18:41:55 -07:00
Josh Curl
95d8ebe146
Simplify configuration 2016-05-31 14:34:04 -07:00
Josh Curl
69fe4bb619 Cache remote repos and service definitions 2016-05-25 09:40:28 -07:00
Ivan Mikushin
af6079f780 ros os upgrade: ask for confirmation first, then download the image and run upgrade
The confirmation question is a bit different if you are upgrading to the same version
2016-05-25 08:44:21 -07:00
Josh Curl
c18cd26e78 Update codegangsta/cli action return signature 2016-05-23 17:22:07 -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
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
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
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
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
28bd8b0ccb Fix ros dev panic 2016-02-04 09:25:36 -07: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
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
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
e25c59f1ab Create ros compose command 2015-09-22 11:17:15 -07: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