diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-12-13 13:37:23 +0100 |
|---|---|---|
| committer | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-12-13 15:05:54 +0100 |
| commit | eea4d05fb495d9f7848489e238c6be2327ab34f3 (patch) | |
| tree | bdb14d47c7c39d55be548db3e3c879574b76f59a /odl-pipeline/lib/tripleo_manager | |
| parent | 416f9cf177801cecfe39f5249d73e3a4a85f0bbd (diff) | |
adding common/config
Change-Id: I2d96e6efa628f066e165a8e37d2604eb8f0634bd
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Diffstat (limited to 'odl-pipeline/lib/tripleo_manager')
| -rwxr-xr-x | odl-pipeline/lib/tripleo_manager/tripleo_manager.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/odl-pipeline/lib/tripleo_manager/tripleo_manager.py b/odl-pipeline/lib/tripleo_manager/tripleo_manager.py index 456564c..0a4ec0d 100755 --- a/odl-pipeline/lib/tripleo_manager/tripleo_manager.py +++ b/odl-pipeline/lib/tripleo_manager/tripleo_manager.py @@ -11,6 +11,7 @@ from utils.utils_log import log_enter_exit, for_all_methods, LOG from utils.service import Service from utils.shutil import shutil from utils.node_manager import NodeManager +from common import config as CONFIG @for_all_methods(log_enter_exit) @@ -31,11 +32,7 @@ class TripleOManager(Service): def run(self, sys_args, config): self.gen_node_info() self.prepare_for_ci_pipeline() - self.gen_env_info(sys_args, config) - self.gen_virtual_deployment_info(sys_args, config) - - def gen_virtual_deployment_info(self, sys_args, config): - pass + self.gen_env_info(sys_args) def prepare_for_ci_pipeline(self): node_manager = NodeManager(config=self.node_info['servers']) @@ -65,18 +62,21 @@ class TripleOManager(Service): # Disconnect ovs node.execute('ovs-vsctl del-controller br-int', as_root=True) - def gen_env_info(self, sys_args, config): + def gen_env_info(self, sys_args): shutil.mkdir_if_not_exsist(sys_args.out) - self.write_out_yaml_config(self.node_info, sys_args.out + '/node.yaml') + self.write_out_yaml_config(self.node_info, + sys_args.out + CONFIG.NODE_YAML_PATH) # copy ssh key shutil.copy('to', '/home/stack/.ssh/id_rsa', - sys_args.out + '/undercloud_ssh/') + sys_args.out + CONFIG.ID_RSA_PATH) shutil.copy('to', '/home/stack/.ssh/id_rsa.pub', - sys_args.out + '/undercloud_ssh/') + sys_args.out + CONFIG.ID_RSA_PATH) # copy rc files - shutil.copy('to', '/home/stack/stackrc', sys_args.out) - shutil.copy('to', '/home/stack/overcloudrc', sys_args.out) + shutil.copy('to', '/home/stack/stackrc', + sys_args.out) + shutil.copy('to', '/home/stack/overcloudrc', + sys_args.out + CONFIG.OVERCLOUDRC_PATH) def gen_node_info(self): for network in self.neutroncl.list_networks()['networks']: |