From b886bce539eb3b6d950673af68996e1d62ddaf40 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Wed, 18 Nov 2015 14:04:46 +0500 Subject: [PATCH] move ros back to /usr/bin/ros also, rm rancherctl --- main.go | 3 +-- os-config.yml | 3 +-- tests/integration/rancherostest/test_01_cloud_config.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 5c7ecc9d..82e6fd9d 100644 --- a/main.go +++ b/main.go @@ -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) diff --git a/os-config.yml b/os-config.yml index 6438db13..22525b1d 100644 --- a/os-config.yml +++ b/os-config.yml @@ -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 diff --git a/tests/integration/rancherostest/test_01_cloud_config.py b/tests/integration/rancherostest/test_01_cloud_config.py index 234b519c..58186de6 100644 --- a/tests/integration/rancherostest/test_01_cloud_config.py +++ b/tests/integration/rancherostest/test_01_cloud_config.py @@ -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']