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

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