From e648fb44db9826d7f87a78b80c80398e82fd7ee6 Mon Sep 17 00:00:00 2001 From: lvdongbing Date: Fri, 14 Oct 2016 02:07:42 -0400 Subject: [PATCH] Change osprofiler option "--profile" to "--os-profile" Osprofiler option "--profile" is conficting with the one in cluster-create and node-create, this patch changes the former to "--os-profile". Change-Id: Ida340a6e503c735d45d8bc27c59e45dcb5d0e018 --- senlinclient/shell.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/senlinclient/shell.py b/senlinclient/shell.py index 05b3916e..92338683 100644 --- a/senlinclient/shell.py +++ b/senlinclient/shell.py @@ -101,7 +101,7 @@ class SenlinShell(object): def add_profiler_args(self, parser): if osprofiler_profiler: parser.add_argument( - '--profile', metavar='HMAC_KEY', + '--os-profile', metavar='HMAC_KEY', help=_('HMAC key to use for encrypting context data for ' 'performance profiling of operation. This key should ' 'be the value of HMAC key configured in osprofiler ' @@ -287,13 +287,13 @@ class SenlinShell(object): # Setup Senlin client connection sc = self._setup_senlin_client(api_ver, args) - profile = osprofiler_profiler and options.profile - if profile: - osprofiler_profiler.init(options.profile) + os_profile = osprofiler_profiler and options.os_profile + if os_profile: + osprofiler_profiler.init(options.os_profile) args.func(sc.service, args) - if profile: + if os_profile: trace_id = osprofiler_profiler.get().get_base_id() print(_("Trace ID: %s") % trace_id) print(_("To display trace use next command:\n"