diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 22:34:54 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-04 16:04:52 +0000 |
| commit | e7e2d84bec0d404057bce203f9c90231360e88ee (patch) | |
| tree | 43e54e897217da67906580991c3c7f0a110250e8 /patches/opnfv-fuel/0015-Remove-check-for-root.patch | |
| parent | 70f2caa773fc5f0e2b1154a5c095665375f02666 (diff) | |
Rebase: deploy related patch series.
After change "common.py: catch stderr in exec_cmd" [1] and other
unrelated changes were merged upstream,
we need to rebase the complete deploy related series.
While we're at it, re-export Fuel@OPNFV patches in Armband.
[1] https://gerrit.opnfv.org/gerrit/#/c/14561/
Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a
Diffstat (limited to 'patches/opnfv-fuel/0015-Remove-check-for-root.patch')
| -rw-r--r-- | patches/opnfv-fuel/0015-Remove-check-for-root.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0015-Remove-check-for-root.patch b/patches/opnfv-fuel/0015-Remove-check-for-root.patch new file mode 100644 index 00000000..ab0df01c --- /dev/null +++ b/patches/opnfv-fuel/0015-Remove-check-for-root.patch @@ -0,0 +1,80 @@ +From: Josep Puigdemont <josep.puigdemont@enea.com> +Date: Wed, 4 May 2016 14:27:23 +0200 +Subject: [PATCH] Remove check for root + +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> +--- + ci/deploy.sh | 5 ----- + deploy/deploy-config.py | 1 - + deploy/deploy.py | 2 -- + deploy/environments/virtual_fuel.py | 2 -- + 4 files changed, 10 deletions(-) + +diff --git a/ci/deploy.sh b/ci/deploy.sh +index cd7f652..5f06a19 100755 +--- a/ci/deploy.sh ++++ b/ci/deploy.sh +@@ -204,11 +204,6 @@ do + esac + done + +-if [[ $EUID -ne 0 ]]; then +- echo "This script must be run as root" 1>&2 +- exit 1 +-fi +- + if [ -z $BASE_CONFIG_URI ] || [ -z $TARGET_LAB ] || \ + [ -z $TARGET_POD ] || [ -z $DEPLOY_SCENARIO ] || \ + [ -z $ISO ]; then +diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py +index 65d51b2..88a1111 100644 +--- a/deploy/deploy-config.py ++++ b/deploy/deploy-config.py +@@ -40,7 +40,6 @@ from common import ( + check_file_exists, + create_dir_if_not_exists, + delete, +- check_if_root, + ArgParser, + ) + +diff --git a/deploy/deploy.py b/deploy/deploy.py +index 9db1754..ca092f5 100755 +--- a/deploy/deploy.py ++++ b/deploy/deploy.py +@@ -32,7 +32,6 @@ from common import ( + check_file_exists, + create_dir_if_not_exists, + delete, +- check_if_root, + ArgParser, + ) + +@@ -232,7 +231,6 @@ class AutoDeploy(object): + return 0 + + def run(self): +- check_if_root() + if self.cleanup_only: + self.cleanup_execution_environment() + else: +diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py +index b1a76e4..4ff68f6 100644 +--- a/deploy/environments/virtual_fuel.py ++++ b/deploy/environments/virtual_fuel.py +@@ -18,7 +18,6 @@ import time + from common import ( + exec_cmd, + check_file_exists, +- check_if_root, + delete, + log, + ) +@@ -135,7 +134,6 @@ class VirtualFuel(ExecutionEnvironment): + vm_definition_overwrite) + + def setup_environment(self): +- check_if_root() + self.cleanup_environment() + self.create_vm() + |