diff options
author | Szilard Cserey <szilard.cserey@ericsson.com> | 2015-08-18 19:47:50 +0200 |
---|---|---|
committer | Szilard Cserey <szilard.cserey@ericsson.com> | 2015-09-16 11:33:23 +0200 |
commit | 49aacd62348d7edf91c5b9bbd40d31708610e1e5 (patch) | |
tree | 0dc637b67d2c56ea71c995ca26113df6c81ce16f /fuel/deploy/setup_execution_environment.py | |
parent | 54f12d2bdd72ae12061ebf62c5b70f357850c411 (diff) |
Autodeployer support for ODL Plugin installation + Fuel 6.1
- Opendaylight plugin installation
- Adapting Autodeployer to Fuel 6.1
- restarting blades that couldn't be discovered Fuel in time
BGS-87 Autodeployment restarts blade if that has not been discovered by Fuel
BGS-90 Fuel 6.1 and Opendaylight Fuel plugin install support for Autodeployer
Change-Id: I83aab3f8caf368a70fd3f2b67c7ba1b6191993c6
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Diffstat (limited to 'fuel/deploy/setup_execution_environment.py')
-rw-r--r-- | fuel/deploy/setup_execution_environment.py | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/fuel/deploy/setup_execution_environment.py b/fuel/deploy/setup_execution_environment.py deleted file mode 100644 index d97fcde..0000000 --- a/fuel/deploy/setup_execution_environment.py +++ /dev/null @@ -1,36 +0,0 @@ -import yaml -import io -import sys -import os - -import common -from environments.libvirt_environment import LibvirtEnvironment -from environments.virtual_fuel import VirtualFuel -from dea import DeploymentEnvironmentAdapter - -exec_cmd = common.exec_cmd -err = common.err -log = common.log -check_dir_exists = common.check_dir_exists -check_file_exists = common.check_file_exists -check_if_root = common.check_if_root -ArgParser = common.ArgParser - -class ExecutionEnvironment(object): - def __new__(cls, storage_dir, pxe_bridge, dha_path, dea): - - with io.open(dha_path) as yaml_file: - dha_struct = yaml.load(yaml_file) - - type = dha_struct['adapter'] - - root_dir = os.path.dirname(os.path.realpath(__file__)) - - if cls is ExecutionEnvironment: - if type == 'libvirt': - return LibvirtEnvironment(storage_dir, dha_path, dea, root_dir) - - if type == 'ipmi' or type == 'hp': - return VirtualFuel(storage_dir, pxe_bridge, dha_path, root_dir) - - return super(ExecutionEnvironment, cls).__new__(cls) |