diff --git a/doc/source/tools/stackalytics-dashboard.txt b/doc/source/tools/stackalytics-dashboard.txt index aee5f950f..721100d8e 100644 --- a/doc/source/tools/stackalytics-dashboard.txt +++ b/doc/source/tools/stackalytics-dashboard.txt @@ -54,8 +54,8 @@ optional arguments: (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format - without the APP-NAME is deprecated in K, and will be - removed in M, along with this option. + without the APP-NAME is deprecated in Kilo, and will + be removed in Mitaka, along with this option. --verbose, -v If set to false, will disable INFO logging level, making WARNING the default. --version show program's version number and exit diff --git a/doc/source/tools/stackalytics-dump.txt b/doc/source/tools/stackalytics-dump.txt index ea7c54c28..1472afc6d 100644 --- a/doc/source/tools/stackalytics-dump.txt +++ b/doc/source/tools/stackalytics-dump.txt @@ -62,8 +62,8 @@ optional arguments: (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format - without the APP-NAME is deprecated in K, and will be - removed in M, along with this option. + without the APP-NAME is deprecated in Kilo, and will + be removed in Mitaka, along with this option. --verbose, -v If set to false, will disable INFO logging level, making WARNING the default. --version show program's version number and exit diff --git a/doc/source/tools/stackalytics-processor.txt b/doc/source/tools/stackalytics-processor.txt index 0155584ce..4466ec10a 100644 --- a/doc/source/tools/stackalytics-processor.txt +++ b/doc/source/tools/stackalytics-processor.txt @@ -11,7 +11,6 @@ usage: stackalytics-processor [-h] [--config-dir DIR] [--config-file PATH] [--members-look-ahead MEMBERS_LOOK_AHEAD] [--nodebug] [--nouse-syslog] [--nouse-syslog-rfc-format] [--noverbose] - [--project-list-uri PROJECT_LIST_URI] [--review-uri REVIEW_URI] [--runtime-storage-uri RUNTIME_STORAGE_URI] [--sources-root SOURCES_ROOT] @@ -70,8 +69,6 @@ optional arguments: --nouse-syslog-rfc-format The inverse of --use-syslog-rfc-format --noverbose The inverse of --verbose - --project-list-uri PROJECT_LIST_URI - The address of file with the official projects list --review-uri REVIEW_URI URI of review system --runtime-storage-uri RUNTIME_STORAGE_URI @@ -90,8 +87,8 @@ optional arguments: (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format - without the APP-NAME is deprecated in K, and will be - removed in M, along with this option. + without the APP-NAME is deprecated in Kilo, and will + be removed in Mitaka, along with this option. --verbose, -v If set to false, will disable INFO logging level, making WARNING the default. --version show program's version number and exit diff --git a/etc/stackalytics.conf b/etc/stackalytics.conf index 572203f95..09cefb41e 100644 --- a/etc/stackalytics.conf +++ b/etc/stackalytics.conf @@ -46,8 +46,8 @@ # (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, # prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The -# format without the APP-NAME is deprecated in K, and will be removed in M, -# along with this option. (boolean value) +# format without the APP-NAME is deprecated in Kilo, and will be removed in +# Mitaka, along with this option. (boolean value) # This option is deprecated for removal. # Its value may be silently ignored in the future. #use_syslog_rfc_format = true @@ -118,9 +118,6 @@ # SSH username for gerrit review system access (string value) #ssh_username = user -# The address of file with the official projects list (string value) -#project_list_uri = https://git.openstack.org/cgit/openstack/governance/plain/reference/projects.yaml - # URI for default data (string value) #driverlog_data_uri = https://git.openstack.org/cgit/stackforge/driverlog/plain/etc/default_data.json diff --git a/stackalytics/processor/config.py b/stackalytics/processor/config.py index 59cf13e34..c56c70da0 100644 --- a/stackalytics/processor/config.py +++ b/stackalytics/processor/config.py @@ -44,10 +44,6 @@ PROCESSOR_OPTS = [ help='SSH key for gerrit review system access'), cfg.StrOpt('ssh-username', default='user', help='SSH username for gerrit review system access'), - cfg.StrOpt('project-list-uri', - default=('https://git.openstack.org/cgit/' - 'openstack/governance/plain/reference/projects.yaml'), - help='The address of file with the official projects list'), cfg.StrOpt('driverlog-data-uri', default='https://git.openstack.org/cgit/' 'stackforge/driverlog/plain/etc/default_data.json', diff --git a/stackalytics/processor/main.py b/stackalytics/processor/main.py index 96cea417d..3686b0bd7 100644 --- a/stackalytics/processor/main.py +++ b/stackalytics/processor/main.py @@ -240,7 +240,7 @@ def apply_corrections(uri, runtime_storage_inst): runtime_storage_inst.apply_corrections(valid_corrections) -def process_project_list(runtime_storage_inst, project_list_uri): +def process_project_list(runtime_storage_inst): module_groups = runtime_storage_inst.get_by_key('module_groups') or {} releases = runtime_storage_inst.get_by_key('releases') or {} @@ -287,7 +287,7 @@ def main(): default_data, cfg.CONF.driverlog_data_uri) - process_project_list(runtime_storage_inst, cfg.CONF.project_list_uri) + process_project_list(runtime_storage_inst) update_pids(runtime_storage_inst)