Remove deprecated options

Author: alvarolopez

caso/extract/manager.py

@@ -35,7 +35,6 @@
     cfg.ListOpt(
         "projects",
         default=[],
-        deprecated_name="tenants",
         help="List of projects to extract accounting records from. You can "
         "use this option, or add 'caso' tag to the project in Keystone. "
         "Please refer to the documentation for more details.",
@@ -63,7 +62,6 @@
     ),
     cfg.StrOpt(
         "extract-to",
-        deprecated_name="extract_to",
         help="Extract record changes until this date. "
         "If it is not set, we use now. If a server has "
         "ended after this date, it will be included, but "
@@ -72,7 +70,6 @@
     ),
     cfg.StrOpt(
         "extract-from",
-        deprecated_name="extract_from",
         help="Extract records that have changed after this date. This "
         "means that if a record has started before this date, and "
         "it has changed after this date (i.e. it is still running "

caso/extract/openstack/nova.py

@@ -34,32 +34,24 @@
     cfg.StrOpt(
         "type_key",
         default="Accelerator:Type",
-        deprecated_name="accelerator_type_key",
-        deprecated_group="DEFAULT",
         help="Metadata key used to retrieve the accelerator type "
         "from the flavor properties.",
     ),
     cfg.StrOpt(
         "vendor_key",
         default="Accelerator:Vendor",
-        deprecated_name="accelerator_vendor_key",
-        deprecated_group="DEFAULT",
         help="Metadata key used to retrieve the accelerator vendor "
         "from the flavor properties.",
     ),
     cfg.StrOpt(
         "model_key",
         default="Accelerator:Model",
-        deprecated_name="accelerator_model_key",
-        deprecated_group="DEFAULT",
         help="Metadata key used to retrieve the accelerator model "
         "from the flavor properties.",
     ),
     cfg.StrOpt(
         "number_key",
         default="Accelerator:Number",
-        deprecated_name="accelerator_number_key",
-        deprecated_group="DEFAULT",
         help="Metadata key used to retrieve the accelerator number "
         "from the flavor properties.",
     ),
@@ -69,16 +61,12 @@
     cfg.StrOpt(
         "name_key",
         default="accounting:benchmark_type",
-        deprecated_name="benchmark_name_key",
-        deprecated_group="DEFAULT",
         help="Metadata key used to retrieve the benchmark type "
         "from the flavor properties.",
     ),
     cfg.StrOpt(
         "value_key",
         default="accounting:benchmark_value",
-        deprecated_name="benchmark_value_key",
-        deprecated_group="DEFAULT",
         help="Metadata key used to retrieve the benchmark value "
         "from the flavor properties.",
     ),

caso/manager.py

@@ -54,7 +54,6 @@
 cli_opts = [
     cfg.BoolOpt(
         "dry-run",
-        deprecated_name="dry_run",
         default=False,
         help="Extract records but do not push records to SSM. This "
         "will not update the last run date.",

doc/source/usage.rst

@@ -91,7 +91,7 @@ extract accountig records:
    Which extractor to use for getting the data. If you do not specify anything,
    nova will be used. Allowed values: nova
 
-.. option:: --projects PROJECTS, --tenants PROJECTS
+.. option:: --projects PROJECTS
 
    List of projects to extract accounting records from.
 

etc/caso/caso.conf.sample

@@ -31,7 +31,6 @@
 # List of projects to extract accounting records from. You can use this option,
 # or add 'caso' tag to the project in Keystone. Please refer to the
 # documentation for more details. (list value)
-# Deprecated group/name - [DEFAULT]/tenants
 #projects =
 
 # Tag used to mark a project in Keystone to be extracted by cASO (string value)