rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-12 21:23:13 +00:00
Code Issues Releases Wiki Activity

move ros back to /usr/bin/ros

Browse Source 
also, rm rancherctl
This commit is contained in:
Ivan Mikushin
2015-11-18 14:04:46 +05:00
parent 906f192d13
commit b886bce539
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@@ -50,8 +50,7 @@ func main() {
registerCmd("/sbin/halt", power.Halt)
registerCmd("/sbin/shutdown", power.Main)
registerCmd("/usr/bin/respawn", respawn.Main)
registerCmd("/usr/sbin/rancherctl", control.Main) // deprecated, use `ros` instead
registerCmd("/usr/sbin/ros", control.Main)
registerCmd("/usr/bin/ros", control.Main)
registerCmd("/usr/bin/cloud-init", cloudinit.Main)
registerCmd("/usr/sbin/netconf", network.Main)
registerCmd("/usr/sbin/wait-for-network", waitfornetwork.Main)

3
os-config.yml
View File

@@ -130,8 +130,7 @@ rancher:
- /usr/bin/ros:/sbin/halt:ro
- /usr/bin/ros:/sbin/shutdown:ro
- /usr/bin/ros:/usr/bin/respawn:ro
- /usr/bin/ros:/usr/sbin/rancherctl:ro
- /usr/bin/ros:/usr/sbin/ros:ro
- /usr/bin/ros:/usr/bin/ros:ro
- /usr/bin/ros:/usr/bin/cloud-init:ro
- /usr/bin/ros:/usr/sbin/netconf:ro
- /usr/bin/ros:/usr/sbin/wait-for-network:ro

2
tests/integration/rancherostest/test_01_cloud_config.py
View File

@@ -33,7 +33,7 @@ def test_rancher_environment(qemu, cloud_config):
u.wait_for_ssh(ssh_command)
v = subprocess.check_output(
ssh_command + ['sudo', 'rancherctl', 'env', 'printenv', 'FLANNEL_NETWORK'],
ssh_command + ['sudo', 'ros', 'env', 'printenv', 'FLANNEL_NETWORK'],
stderr=subprocess.STDOUT, universal_newlines=True)
assert v.strip() == cloud_config['rancher']['environment']['FLANNEL_NETWORK']