1
0
mirror of https://github.com/rancher/os.git synced 2025-06-30 08:41:48 +00:00
Commit Graph

368 Commits

Author SHA1 Message Date
Darren Shepherd
a811132245 Revert "Move Packet datasource from cloud-init-pre to cloud-init" 2016-09-30 07:41:03 -07:00
Darren Shepherd
2122f99fce Merge pull request #1260 from joshwget/noformat-and-raid
Add noformat and RAID installer types
2016-09-30 07:32:13 -07:00
Darren Shepherd
bdcda45a11 Merge pull request #1256 from joshwget/move-packet-datasource
Move Packet datasource from cloud-init-pre to cloud-init
2016-09-30 07:29:39 -07:00
Josh Curl
2fc1d3fa5f
Add noformat and RAID installer types 2016-09-29 21:55:19 -07:00
Josh Curl
395ef0b8c4
Move Packet datasource from cloud-init-pre to cloud-init 2016-09-27 11:18:24 -07:00
Josh Curl
cf998978a8
Refactor how consoles and engines are loaded 2016-09-26 22:03:06 -07:00
Josh Curl
b65e429bb6
Run gofmt and fix vet errors 2016-09-26 21:32:37 -07:00
Josh Curl
1731fc5642
Preserve custom kernel arguments when upgrading 2016-09-26 17:27:53 -07:00
Josh Curl
d782d0b17f
Show output for more commands in cloud-init-execute 2016-09-15 10:51:26 -07:00
Josh Curl
21cf86665b
Use runc exec to start User Docker 2016-09-09 09:06:23 -07:00
Darren Shepherd
70f2c8dd3a Merge pull request #1209 from joshwget/start-script-fixes
Fix typo and set output for start scripts
2016-09-01 19:39:45 -07:00
Josh Curl
3b68017af5
Fix typo and set output for start scripts 2016-09-01 17:05:24 -07:00
Darren Shepherd
2081b1be95 Merge pull request #1208 from joshwget/reduce-memory-usage
Reduce memory usage copying Docker binaries
2016-09-01 10:53:13 -07:00
Josh Curl
73d0790e30
Reduce memory usage copying Docker binaries 2016-09-01 09:56:03 -07:00
Darren Shepherd
17e01a3771 Merge pull request #1205 from joshwget/execute-start-scripts-using-bash
Execute start scripts using bash
2016-08-31 16:38:03 -07:00
Josh Curl
d4a026dc5d
Execute start scripts using bash 2016-08-31 16:18:51 -07:00
Josh Curl
258a5a173c
Modify how /var/lib/rancher/conf/docker is sourced 2016-08-29 15:54:40 -07:00
Darren Shepherd
92e20827d8 Fix respawn.conf.d 2016-08-24 21:43:51 -07:00
Cougar
d725d99fa5 Do not ask about reboot if --force and no --no-reboot 2016-08-25 01:51:33 +03:00
Darren Shepherd
48c40a57c5 Merge pull request #1180 from joshwget/dev-mount
Use mount command to mount /dev
2016-08-24 14:44:20 -07:00
Josh Curl
c0bcb61158
Symlink docker-proxy 2016-08-24 09:43:03 -07:00
Josh Curl
360b576411
Use mount command to mount /dev 2016-08-23 11:07:13 -07:00
Darren Shepherd
2cfe4d289d Make respawn slightly extensible 2016-08-22 14:31:36 -07:00
Darren Shepherd
723278a440 Merge pull request #1174 from joshwget/specify-each-autologin-tty
Specify each autologin tty
2016-08-22 13:50:50 -07:00
Josh Curl
4677af8419
Implement runcmd 2016-08-22 13:22:27 -07:00
Josh Curl
bbab6aa760
Specify each tty for autologin 2016-08-22 11:19:24 -07:00
Darren Shepherd
7a1609a398 Merge pull request #1160 from joshwget/use-partx
Replace partprobe with partx
2016-08-18 18:11:33 -07:00
Josh Curl
da69a464fb
Replace partprobe with partx 2016-08-18 15:35:39 -07:00
Darren Shepherd
add2080fb2 Merge pull request #1163 from joshwget/fix-duplicate
Fix duplicate volumes_from when switching consoles
2016-08-18 15:32:38 -07:00
Darren Shepherd
31193538e6 Merge pull request #1162 from joshwget/engine-list-details
Show current/enabled/disabled in 'ros engine list'
2016-08-18 15:32:02 -07:00
Darren Shepherd
26a9331e41 Merge pull request #1157 from joshwget/autologin-key
Add rancher.autologin key
2016-08-18 15:29:19 -07:00
Josh Curl
42748a2c4b
Fix duplicate volumes_from when switching consoles 2016-08-18 15:05:06 -07:00
Josh Curl
11cf2a195b
Show current/enabled/disabled in 'ros engine list' 2016-08-17 16:33:49 -07:00
Josh Curl
4b3198dff4
Add rancher.autologin key 2016-08-17 16:07:46 -07:00
Josh Curl
b04536e55f
Fix typo writing to sshd_config 2016-08-16 22:02:26 -07:00
Josh Curl
65468736df
Correct permissions on home directory 2016-08-16 16:25:01 -07:00
Darren Shepherd
6abdeb34d6 Merge pull request #1143 from joshwget/better-engine-switching
Make it easier to switch between Docker engines
2016-08-15 21:21:23 -07:00
Josh Curl
80c72d0761
Make it easier to switch between Docker engines 2016-08-15 15:06:26 -07:00
Josh Curl
d4801494a1
Use the mount command to apply cloud-config mounts 2016-08-15 13:01:40 -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
889cb9eea8
Split cloud-init into cloud-init-execute and cloud-init-save 2016-08-04 15:47:12 -07:00
Josh Curl
83332ceade
Add --no-pull flag to 'ros console switch' 2016-07-21 10:25:32 -07:00
Darren Shepherd
f98e3efad2 Merge pull request #1077 from joshwget/update-console-switch-warning
Update console switch warning
2016-06-30 21:51:07 -07:00
Josh Curl
25768888a5
Only log once during upgrade 2016-06-30 16:28:32 -07:00
Josh Curl
78fc0d15cc
Update console switch warning 2016-06-30 14:02:04 -07:00
Ivan Mikushin
2264aa8230 Copyright comment cleanup
Add back the copyright notice
2016-06-29 22:50:22 -07:00
Ivan Mikushin
e6a550d786 Fix fetching SSH authorized keys from GCE 2016-06-29 20:35:49 -07:00
Josh Curl
92b24d9790
Console switch warning based on running console and not enabled console 2016-06-29 00:52:38 -07:00
Darren Shepherd
b0c6ad709c Merge pull request #1056 from joshwget/respect-customization
Fix two instances where customization isn't respected
2016-06-28 15:44:08 -07:00
Darren Shepherd
9abb58641d Merge pull request #1055 from joshwget/ros-console-list-details
Add details to 'ros console list'
2016-06-28 15:36:44 -07:00
Josh Curl
b09c09edf4
Fix two instances where customization isn't respected 2016-06-28 14:35:51 -07:00
Josh Curl
8f8dec51ea
Add details to 'ros console list' 2016-06-28 11:18:26 -07:00
Josh Curl
128c228ff5
Add swap support in cloud config mounts 2016-06-22 21:50:29 -07:00
Josh Curl
921c00c8ea
Add sysctl support in cloud config 2016-06-17 23:05:45 -07:00
Josh Curl
65bff509e0
Remove second exec start in User Docker 2016-06-17 09:50:36 -07:00
Josh Curl
a9e34206bc
Warn when attempting to switch to the same console 2016-06-16 09:54:12 -07:00
Josh Curl
445d35e33e
Revolve device before performing cloud config mount 2016-06-15 14:20:06 -07:00
Darren Shepherd
e98fc80d12 Merge pull request #1013 from joshwget/additional-mounts
Additional mounts can be set in cloud config
2016-06-14 15:46:41 -07:00
Josh Curl
f24facc06c
Additional mounts can be set in cloud config 2016-06-14 15:25:56 -07:00
Josh Curl
d205af4abf
Add --input flag to ros config merge 2016-06-14 15:05:12 -07:00
Josh Curl
c4c8ec402c
Add 'ros console enable' command 2016-06-12 22:28:24 -07:00
Josh Curl
3153c28e86
Support switching to the default console 2016-06-12 12:02:07 -07:00
Josh Curl
abfb45401a
Update console switch warning message 2016-06-10 10:54:06 -07:00
Josh Curl
9f7e6a19ab
Add --force flag to console switch 2016-06-10 10:54:02 -07:00
Darren Shepherd
77612b87c5 Merge pull request #989 from joshwget/more-service-logging
Enable logging in more ros command services
2016-06-07 22:01:30 -07:00
Josh Curl
b279fa85f6
Enable logging in more ros command services 2016-06-07 19:19:18 -07:00
Josh Curl
3b8b47f103
Various User Docker improvements 2016-06-07 18:59:45 -07:00
Josh Curl
9658d3bffd
Replace resize system service with cloud config option 2016-06-07 09:53:41 -07:00
Darren Shepherd
cd76d85aea Merge pull request #980 from joshwget/first-class-consoles
First class consoles
2016-06-06 15:27:23 -07:00
Josh Curl
719d255636
First class consoles 2016-06-06 15:13:15 -07:00
Darren Shepherd
f22c692529 Merge pull request #975 from imikushin/tls
Disable docker server TLS cert auto-generation
2016-06-06 12:43:19 -07:00
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
8ab32c820f Docker 1.11.1 2016-06-03 11:38:25 -07:00
Darren Shepherd
43f90b8e61 Merge pull request #978 from imikushin/gce-cloud-config
Use GCE metadata service
2016-06-02 20:55:12 -06:00
Ivan Mikushin
c5fb496a5d use gce metadata service to get user-data and other metadata 2016-06-02 19:49:21 -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
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
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
Darren Shepherd
a14846152b Update vendor 2016-05-31 18:14:32 -07:00
Josh Curl
95d8ebe146
Simplify configuration 2016-05-31 14:34:04 -07:00
Josh Curl
6ec9ce1bc6 Replace wait-for-network services with retries 2016-05-26 18:54:42 -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
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
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