Skip to content

Commit 5da8065

Browse files
committed
extractors: move projects options to correct place
1 parent 0b5d621 commit 5da8065

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

caso/extract/base.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,6 @@
2929
cfg.StrOpt(
3030
"service_name", default="$site_name", help="Service name within the site"
3131
),
32-
cfg.ListOpt(
33-
"projects",
34-
default=[],
35-
deprecated_name="tenants",
36-
help="List of projects to extract accounting records from. You can "
37-
"use this option, or add 'caso' tag to the project in Keystone. "
38-
"Please refer to the documentation for more details.",
39-
),
40-
cfg.StrOpt(
41-
"caso_tag",
42-
default="caso",
43-
help="Tag used to mark a project in Keystone to be extracted by cASO",
44-
),
4532
cfg.StrOpt(
4633
"mapping_file",
4734
default="/etc/caso/voms.json",

caso/extract/manager.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,19 @@
3030
from caso import loading
3131

3232
cli_opts = [
33+
cfg.ListOpt(
34+
"projects",
35+
default=[],
36+
deprecated_name="tenants",
37+
help="List of projects to extract accounting records from. You can "
38+
"use this option, or add 'caso' tag to the project in Keystone. "
39+
"Please refer to the documentation for more details.",
40+
),
41+
cfg.StrOpt(
42+
"caso_tag",
43+
default="caso",
44+
help="Tag used to mark a project in Keystone to be extracted by cASO",
45+
),
3346
cfg.StrOpt(
3447
"extract-to",
3548
deprecated_name="extract_to",
@@ -65,8 +78,6 @@
6578
CONF = cfg.CONF
6679

6780
CONF.register_cli_opts(cli_opts)
68-
CONF.import_opt("projects", "caso.extract.base")
69-
CONF.import_opt("caso_tag", "caso.extract.base")
7081

7182
LOG = log.getLogger(__name__)
7283

0 commit comments

Comments
 (0)