diff options
author | Tim Rozet <trozet@redhat.com> | 2017-01-12 12:27:41 -0500 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2017-01-30 14:36:24 -0500 |
commit | c7cbf47421382ef5db5ad8a2f470def52640b21f (patch) | |
tree | 78474dd4298b163b7816e038533f50a586df9e8c /odl-pipeline/lib/utils/service.py | |
parent | ced7ceab968ee2542b5d4d4255195d971aa61fea (diff) |
Updates ODL Pipeline scripts for CSIT
Changes Include:
- Change to TripleOInspector which only introspect a
current Apex deployment and dump yaml config to be bundled with
snapshots.
- Add TripleOHelper which consists of all tripleO helper functions.
Many this are done to virsh so the idea is to have at.
Some point in time a libvirtHelper, or use another libvirt
python lib. Thatsway it is a class so that we can inherit
later on.
- New argument for passing the SSH private key to use to connect to
nodes is added to the service utils.
- Some general clean up and consolidation of logic
JIRA: APEX-363
Change-Id: I792db0fac3f4e81969fe85c05fc298fe5af02537
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'odl-pipeline/lib/utils/service.py')
-rwxr-xr-x | odl-pipeline/lib/utils/service.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/odl-pipeline/lib/utils/service.py b/odl-pipeline/lib/utils/service.py index 39cdce5..cf46872 100755 --- a/odl-pipeline/lib/utils/service.py +++ b/odl-pipeline/lib/utils/service.py @@ -13,6 +13,7 @@ import argparse import traceback from utils_log import LOG, LOG_PATH from abc import abstractmethod +from ssh_util import SSH_CONFIG class Service(object): @@ -31,6 +32,8 @@ class Service(object): parser = self._create_cli_parser() sys_args = parser.parse_args() config = self.read_config(sys_args) + if sys_args.ssh_key_file: + SSH_CONFIG['ID_RSA_PATH'] = sys_args.ssh_key_file self.run(sys_args, config) @abstractmethod @@ -49,6 +52,9 @@ class Service(object): # required=False) # parser.add_argument('--boolean', help="", # required=False, action='store_true') + parser.add_argument('--ssh-key-file', + help="SSH private key file to use", + required=False) return self.create_cli_parser(parser) def read_config(self, sys_args): |