From 440c1f1321eb06f570207506d212220661bd3a9d Mon Sep 17 00:00:00 2001
From: Josep Puigdemont <josep.puigdemont@enea.com>
Date: Fri, 17 Jun 2016 17:28:59 +0200
Subject: opnv-fuel: updated deploy patch set

Change-Id: I9442f217d2f840382b40f6eae77ddb9ae2ddbadc
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
---
 .../opnfv-fuel/0015-Remove-check-for-root.patch    | 80 ----------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 patches/opnfv-fuel/0015-Remove-check-for-root.patch

(limited to 'patches/opnfv-fuel/0015-Remove-check-for-root.patch')

diff --git a/patches/opnfv-fuel/0015-Remove-check-for-root.patch b/patches/opnfv-fuel/0015-Remove-check-for-root.patch
deleted file mode 100644
index ab0df01c..00000000
--- a/patches/opnfv-fuel/0015-Remove-check-for-root.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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()
- 
-- 
cgit 1.2.3-korg