patches/opnfv-fuel/0007-Remove-check-for-root.patch

   1 From b7d5f0ca9a76de6d99fc5d6f5cbb8df864c62b7b Mon Sep 17 00:00:00 2001
   2 From: Josep Puigdemont <josep.puigdemont@enea.com>
   3 Date: Wed, 4 May 2016 14:27:23 +0200
   4 Subject: [PATCH] Remove check for root
   5
   6 Change-Id: Ic6bfaf07c0d9d347aec2df8724184d0314665503
   7 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
   8 ---
   9  ci/deploy.sh                        | 5 -----
  10  deploy/deploy-config.py             | 1 -
  11  deploy/deploy.py                    | 2 --
  12  deploy/environments/virtual_fuel.py | 2 --
  13  4 files changed, 10 deletions(-)
  14
  15 diff --git a/ci/deploy.sh b/ci/deploy.sh
  16 index c08a94b..081806c 100755
  17 --- a/ci/deploy.sh
  18 +++ b/ci/deploy.sh
  19 @@ -209,11 +209,6 @@ do
  20      esac
  21  done
  22
  23 -if [[ $EUID -ne 0 ]]; then
  24 -    echo "This script must be run as root" 1>&2
  25 -    exit 1
  26 -fi
  27 -
  28  if [ -z $BASE_CONFIG_URI ] || [ -z $TARGET_LAB ] || \
  29     [ -z $TARGET_POD ] || [ -z $DEPLOY_SCENARIO ] || \
  30     [ -z $ISO ]; then
  31 diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
  32 index 65d51b2..88a1111 100644
  33 --- a/deploy/deploy-config.py
  34 +++ b/deploy/deploy-config.py
  35 @@ -40,7 +40,6 @@ from common import (
  36      check_file_exists,
  37      create_dir_if_not_exists,
  38      delete,
  39 -    check_if_root,
  40      ArgParser,
  41  )
  42
  43 diff --git a/deploy/deploy.py b/deploy/deploy.py
  44 index 56e5bd5..a021e28 100755
  45 --- a/deploy/deploy.py
  46 +++ b/deploy/deploy.py
  47 @@ -33,7 +33,6 @@ from common import (
  48      check_dir_exists,
  49      create_dir_if_not_exists,
  50      delete,
  51 -    check_if_root,
  52      ArgParser,
  53  )
  54
  55 @@ -234,7 +233,6 @@ class AutoDeploy(object):
  56          return 0
  57
  58      def run(self):
  59 -        check_if_root()
  60          if self.cleanup_only:
  61              self.cleanup_execution_environment()
  62          else:
  63 diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
  64 index b1a76e4..4ff68f6 100644
  65 --- a/deploy/environments/virtual_fuel.py
  66 +++ b/deploy/environments/virtual_fuel.py
  67 @@ -18,7 +18,6 @@ import time
  68  from common import (
  69      exec_cmd,
  70      check_file_exists,
  71 -    check_if_root,
  72      delete,
  73      log,
  74  )
  75 @@ -135,7 +134,6 @@ class VirtualFuel(ExecutionEnvironment):
  76                         vm_definition_overwrite)
  77
  78      def setup_environment(self):
  79 -        check_if_root()
  80          self.cleanup_environment()
  81          self.create_vm()
  82
  83 --
  84 2.5.5
  85