summaryrefslogtreecommitdiffstats
path: root/ci/prepare_env.py
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-07-04 07:39:56 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-04 07:39:56 +0000
commited39c21344dc4b4209eb4319ba15ce60defc3e90 (patch)
treef5c9a08f23196cc3a728beadf375199eee083db9 /ci/prepare_env.py
parent32462ed96c883239a9aac15faa70d97a78780fdb (diff)
parentbbc47d487f06da2906116e5ade134e11c4221786 (diff)
Merge "Change OpenStack clean behaviour"
Diffstat (limited to 'ci/prepare_env.py')
-rw-r--r--ci/prepare_env.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index 5754a62b2..4f29260f6 100644
--- a/ci/prepare_env.py
+++ b/ci/prepare_env.py
@@ -12,20 +12,19 @@
# http://www.apache.org/licenses/LICENSE-2.0
#
+
import argparse
import os
import re
import subprocess
import sys
-import yaml
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
-import functest.utils.generate_defaults as gen_def
import functest.utils.openstack_utils as os_utils
+import yaml
-""" arguments """
actions = ['start', 'check']
parser = argparse.ArgumentParser()
parser.add_argument("action", help="Possible actions are: "
@@ -241,12 +240,6 @@ def install_rally():
"OpenStack flavors."))
-def generate_os_defaults():
- print_separator()
- logger.info("Generating OpenStack defaults...")
- gen_def.main()
-
-
def check_environment():
msg_not_active = "The Functest environment is not installed."
if not os.path.isfile(ENV_FILE):
@@ -274,7 +267,6 @@ def main():
source_rc_file()
verify_deployment()
install_rally()
- generate_os_defaults()
with open(ENV_FILE, "w") as env_file:
env_file.write("1")