summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-09 10:22:51 +0000
committerGerrit Code Review <review@openstack.org>2019-01-09 10:22:51 +0000
commitfba8546d425a1ed30b923f9e94ada1b8b61b94e2 (patch)
treec50616ee4cab7d45e87653ab3f6fadd4230ee1cd
parent43182e1ebf9c1f75df339e6a4c7242b598ce0ed4 (diff)
parent20af772ee7a2f46d798ffb6869f36d788299fb92 (diff)
Merge "Fix pep8 E402"
-rw-r--r--api-ref/source/conf.py3
-rw-r--r--murano/cmd/api.py18
-rw-r--r--murano/cmd/cfapi.py19
-rw-r--r--murano/cmd/engine.py18
-rw-r--r--murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py7
-rw-r--r--murano/db/migration/alembic_migrations/versions/001_initial_version.py8
-rw-r--r--murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py6
-rw-r--r--murano/db/migration/alembic_migrations/versions/003_add_action_entry.py9
-rw-r--r--murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py9
-rw-r--r--murano/db/migration/alembic_migrations/versions/005_environment-template.py6
-rw-r--r--murano/db/migration/alembic_migrations/versions/006_add_task_result.py6
-rw-r--r--murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py7
-rw-r--r--murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py7
-rw-r--r--murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py7
-rw-r--r--murano/db/migration/alembic_migrations/versions/012_support_domain_users.py7
-rw-r--r--murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py8
-rw-r--r--murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py6
-rw-r--r--murano/db/migration/alembic_migrations/versions/015_adding_text_description.py7
-rw-r--r--murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py8
-rw-r--r--murano/opts.py10
20 files changed, 77 insertions, 99 deletions
diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 3bbb800..cf3fe67 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -27,6 +27,8 @@
27import os 27import os
28import sys 28import sys
29 29
30from murano.version import version_info
31
30extensions = [ 32extensions = [
31 'os_api_ref', 33 'os_api_ref',
32 'openstackdocstheme' 34 'openstackdocstheme'
@@ -74,7 +76,6 @@ copyright = u'2016-present, OpenStack Foundation'
74# |version| and |release|, also used in various other places throughout the 76# |version| and |release|, also used in various other places throughout the
75# built documents. 77# built documents.
76# 78#
77from murano.version import version_info
78# The full version, including alpha/beta/rc tags. 79# The full version, including alpha/beta/rc tags.
79release = version_info.release_string() 80release = version_info.release_string()
80# The short X.Y version. 81# The short X.Y version.
diff --git a/murano/cmd/api.py b/murano/cmd/api.py
index d9802ae..91c17cb 100644
--- a/murano/cmd/api.py
+++ b/murano/cmd/api.py
@@ -16,19 +16,10 @@
16 16
17 17
18import os 18import os
19import sys
19 20
20import eventlet 21import eventlet
21 22
22if os.name == 'nt':
23 # eventlet monkey patching causes subprocess.Popen to fail on Windows
24 # when using pipes due to missing non blocking I/O support
25 eventlet.monkey_patch(os=False)
26else:
27 eventlet.monkey_patch()
28
29
30import sys
31
32from oslo_concurrency import processutils 23from oslo_concurrency import processutils
33from oslo_config import cfg 24from oslo_config import cfg
34from oslo_log import log as logging 25from oslo_log import log as logging
@@ -45,6 +36,13 @@ from murano.common import wsgi
45CONF = cfg.CONF 36CONF = cfg.CONF
46 37
47 38
39if os.name == 'nt':
40 # eventlet monkey patching causes subprocess.Popen to fail on Windows
41 # when using pipes due to missing non blocking I/O support
42 eventlet.monkey_patch(os=False)
43else:
44 eventlet.monkey_patch()
45
48# If ../murano/__init__.py exists, add ../ to Python search path, so that 46# If ../murano/__init__.py exists, add ../ to Python search path, so that
49# it will override what happens to be installed in /usr/(local/)lib/python... 47# it will override what happens to be installed in /usr/(local/)lib/python...
50root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) 48root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
diff --git a/murano/cmd/cfapi.py b/murano/cmd/cfapi.py
index b93f30c..9bfd922 100644
--- a/murano/cmd/cfapi.py
+++ b/murano/cmd/cfapi.py
@@ -14,21 +14,11 @@
14# License for the specific language governing permissions and limitations 14# License for the specific language governing permissions and limitations
15# under the License. 15# under the License.
16 16
17
18import os 17import os
18import sys
19 19
20import eventlet 20import eventlet
21 21
22if os.name == 'nt':
23 # eventlet monkey patching causes subprocess.Popen to fail on Windows
24 # when using pipes due to missing non blocking I/O support
25 eventlet.monkey_patch(os=False)
26else:
27 eventlet.monkey_patch()
28
29
30import sys
31
32from oslo_config import cfg 22from oslo_config import cfg
33from oslo_log import log as logging 23from oslo_log import log as logging
34from oslo_service import service 24from oslo_service import service
@@ -42,6 +32,13 @@ from murano.common import wsgi
42CONF = cfg.CONF 32CONF = cfg.CONF
43 33
44 34
35if os.name == 'nt':
36 # eventlet monkey patching causes subprocess.Popen to fail on Windows
37 # when using pipes due to missing non blocking I/O support
38 eventlet.monkey_patch(os=False)
39else:
40 eventlet.monkey_patch()
41
45# If ../murano/__init__.py exists, add ../ to Python search path, so that 42# If ../murano/__init__.py exists, add ../ to Python search path, so that
46# it will override what happens to be installed in /usr/(local/)lib/python... 43# it will override what happens to be installed in /usr/(local/)lib/python...
47root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) 44root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
diff --git a/murano/cmd/engine.py b/murano/cmd/engine.py
index 9318064..260af90 100644
--- a/murano/cmd/engine.py
+++ b/murano/cmd/engine.py
@@ -15,19 +15,10 @@
15# under the License. 15# under the License.
16 16
17import os 17import os
18import sys
18 19
19import eventlet 20import eventlet
20 21
21if os.name == 'nt':
22 # eventlet monkey patching causes subprocess.Popen to fail on Windows
23 # when using pipes due to missing non blocking I/O support
24 eventlet.monkey_patch(os=False)
25else:
26 eventlet.monkey_patch()
27
28
29import sys
30
31from oslo_concurrency import processutils 22from oslo_concurrency import processutils
32from oslo_log import log as logging 23from oslo_log import log as logging
33from oslo_service import service 24from oslo_service import service
@@ -38,6 +29,13 @@ from murano.common import engine
38CONF = config.CONF 29CONF = config.CONF
39 30
40 31
32if os.name == 'nt':
33 # eventlet monkey patching causes subprocess.Popen to fail on Windows
34 # when using pipes due to missing non blocking I/O support
35 eventlet.monkey_patch(os=False)
36else:
37 eventlet.monkey_patch()
38
41# If ../murano/__init__.py exists, add ../ to Python search path, so that 39# If ../murano/__init__.py exists, add ../ to Python search path, so that
42# it will override what happens to be installed in /usr/(local/)lib/python... 40# it will override what happens to be installed in /usr/(local/)lib/python...
43root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir) 41root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
diff --git a/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py b/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py
index 8b4664a..cd5ecdb 100644
--- a/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py
+++ b/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py
@@ -18,13 +18,12 @@ Create Date: 2016-03-30 16:34:33.698760
18 18
19""" 19"""
20 20
21# revision identifiers, used by Alembic.
22revision = '001'
23down_revision = None
24
25from alembic import op 21from alembic import op
26import sqlalchemy as sa 22import sqlalchemy as sa
27 23
24# revision identifiers, used by Alembic.
25revision = '001'
26down_revision = None
28 27
29MYSQL_ENGINE = 'InnoDB' 28MYSQL_ENGINE = 'InnoDB'
30MYSQL_CHARSET = 'utf8' 29MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/001_initial_version.py b/murano/db/migration/alembic_migrations/versions/001_initial_version.py
index 5f173ed..8bb4e4d 100644
--- a/murano/db/migration/alembic_migrations/versions/001_initial_version.py
+++ b/murano/db/migration/alembic_migrations/versions/001_initial_version.py
@@ -18,11 +18,6 @@ Revises: None
18Create Date: 2014-05-29 16:32:33.698760 18Create Date: 2014-05-29 16:32:33.698760
19 19
20""" 20"""
21
22# revision identifiers, used by Alembic.
23revision = '001'
24down_revision = None
25
26import uuid 21import uuid
27 22
28from alembic import op 23from alembic import op
@@ -33,6 +28,9 @@ from sqlalchemy.sql.expression import table as sa_table
33from murano.common import consts 28from murano.common import consts
34from murano.db.sqla import types as st 29from murano.db.sqla import types as st
35 30
31# revision identifiers, used by Alembic.
32revision = '001'
33down_revision = None
36 34
37MYSQL_ENGINE = 'InnoDB' 35MYSQL_ENGINE = 'InnoDB'
38MYSQL_CHARSET = 'utf8' 36MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py b/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py
index a8811d2..14e3ee7 100644
--- a/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py
+++ b/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py
@@ -18,15 +18,13 @@ Revises: None
18Create Date: 2014-06-23 16:34:33.698760 18Create Date: 2014-06-23 16:34:33.698760
19 19
20""" 20"""
21from alembic import op
22import sqlalchemy as sa
21 23
22# revision identifiers, used by Alembic. 24# revision identifiers, used by Alembic.
23revision = '002' 25revision = '002'
24down_revision = '001' 26down_revision = '001'
25 27
26from alembic import op
27import sqlalchemy as sa
28
29
30MYSQL_ENGINE = 'InnoDB' 28MYSQL_ENGINE = 'InnoDB'
31MYSQL_CHARSET = 'utf8' 29MYSQL_CHARSET = 'utf8'
32 30
diff --git a/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py b/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py
index 98c1c74..8e8b04b 100644
--- a/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py
+++ b/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py
@@ -19,16 +19,15 @@ Revises: table deployment
19Create Date: 2014-07-30 16:11:33.244 19Create Date: 2014-07-30 16:11:33.244
20 20
21""" 21"""
22
23# revision identifiers, used by Alembic.
24revision = '003'
25down_revision = '002'
26
27from alembic import op 22from alembic import op
28import sqlalchemy as sa 23import sqlalchemy as sa
29 24
30import murano.db.migration.helpers as helpers 25import murano.db.migration.helpers as helpers
31 26
27# revision identifiers, used by Alembic.
28revision = '003'
29down_revision = '002'
30
32MYSQL_ENGINE = 'InnoDB' 31MYSQL_ENGINE = 'InnoDB'
33MYSQL_CHARSET = 'utf8' 32MYSQL_CHARSET = 'utf8'
34 33
diff --git a/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py b/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py
index 208b407..1f9e8c8 100644
--- a/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py
+++ b/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py
@@ -18,17 +18,16 @@ Revision ID: 004
18Revises: table package 18Revises: table package
19 19
20""" 20"""
21
22# revision identifiers, used by Alembic.
23revision = '004'
24down_revision = '003'
25
26from alembic import op 21from alembic import op
27import sqlalchemy as sa 22import sqlalchemy as sa
28 23
29import murano.db.migration.helpers as helpers 24import murano.db.migration.helpers as helpers
30from murano.db.sqla import types as st 25from murano.db.sqla import types as st
31 26
27# revision identifiers, used by Alembic.
28revision = '004'
29down_revision = '003'
30
32MYSQL_ENGINE = 'InnoDB' 31MYSQL_ENGINE = 'InnoDB'
33MYSQL_CHARSET = 'utf8' 32MYSQL_CHARSET = 'utf8'
34 33
diff --git a/murano/db/migration/alembic_migrations/versions/005_environment-template.py b/murano/db/migration/alembic_migrations/versions/005_environment-template.py
index c3ccd34..e328882 100644
--- a/murano/db/migration/alembic_migrations/versions/005_environment-template.py
+++ b/murano/db/migration/alembic_migrations/versions/005_environment-template.py
@@ -19,15 +19,13 @@ Revision ID: 005
19Revises: table template 19Revises: table template
20 20
21""" 21"""
22from alembic import op
23import sqlalchemy as sa
22 24
23# revision identifiers, used by Alembic. 25# revision identifiers, used by Alembic.
24revision = '005' 26revision = '005'
25down_revision = '004' 27down_revision = '004'
26 28
27from alembic import op
28import sqlalchemy as sa
29
30
31MYSQL_ENGINE = 'InnoDB' 29MYSQL_ENGINE = 'InnoDB'
32MYSQL_CHARSET = 'utf8' 30MYSQL_CHARSET = 'utf8'
33 31
diff --git a/murano/db/migration/alembic_migrations/versions/006_add_task_result.py b/murano/db/migration/alembic_migrations/versions/006_add_task_result.py
index 8d1eb05..1897740 100644
--- a/murano/db/migration/alembic_migrations/versions/006_add_task_result.py
+++ b/murano/db/migration/alembic_migrations/versions/006_add_task_result.py
@@ -18,15 +18,13 @@ Revises: None
18Create Date: 2015-02-15 12:14:12 18Create Date: 2015-02-15 12:14:12
19 19
20""" 20"""
21from alembic import op
22import sqlalchemy as sa
21 23
22# revision identifiers, used by Alembic. 24# revision identifiers, used by Alembic.
23revision = '006' 25revision = '006'
24down_revision = '005' 26down_revision = '005'
25 27
26from alembic import op
27import sqlalchemy as sa
28
29
30MYSQL_ENGINE = 'InnoDB' 28MYSQL_ENGINE = 'InnoDB'
31MYSQL_CHARSET = 'utf8' 29MYSQL_CHARSET = 'utf8'
32 30
diff --git a/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py b/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py
index 97f9876..c491251 100644
--- a/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py
+++ b/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py
@@ -18,13 +18,12 @@ Create Date: 2015-08-17 16:34:33.698760
18 18
19""" 19"""
20 20
21# revision identifiers, used by Alembic.
22revision = '009'
23down_revision = '008'
24
25from alembic import op 21from alembic import op
26import sqlalchemy as sa 22import sqlalchemy as sa
27 23
24# revision identifiers, used by Alembic.
25revision = '009'
26down_revision = '008'
28 27
29MYSQL_ENGINE = 'InnoDB' 28MYSQL_ENGINE = 'InnoDB'
30MYSQL_CHARSET = 'utf8' 29MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py b/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py
index 63d2cd6..f426bf7 100644
--- a/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py
+++ b/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py
@@ -18,13 +18,12 @@ Create Date: 2015-09-08 00:00:00.698760
18 18
19""" 19"""
20 20
21# revision identifiers, used by Alembic.
22revision = '010'
23down_revision = '009'
24
25from alembic import op 21from alembic import op
26import sqlalchemy as sa 22import sqlalchemy as sa
27 23
24# revision identifiers, used by Alembic.
25revision = '010'
26down_revision = '009'
28 27
29MYSQL_ENGINE = 'InnoDB' 28MYSQL_ENGINE = 'InnoDB'
30MYSQL_CHARSET = 'utf8' 29MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py b/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py
index d473c6e..2a18ff3 100644
--- a/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py
+++ b/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py
@@ -20,13 +20,12 @@ Revises: table template
20 20
21""" 21"""
22 22
23# revision identifiers, used by Alembic.
24revision = '011'
25down_revision = '010'
26
27from alembic import op 23from alembic import op
28import sqlalchemy as sa 24import sqlalchemy as sa
29 25
26# revision identifiers, used by Alembic.
27revision = '011'
28down_revision = '010'
30 29
31MYSQL_ENGINE = 'InnoDB' 30MYSQL_ENGINE = 'InnoDB'
32MYSQL_CHARSET = 'utf8' 31MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py b/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py
index 86034f7..a81f1d4 100644
--- a/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py
+++ b/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py
@@ -20,13 +20,12 @@ Revises: table session, table package
20 20
21""" 21"""
22 22
23# revision identifiers, used by Alembic.
24revision = '012'
25down_revision = '011'
26
27from alembic import op 23from alembic import op
28import sqlalchemy as sa 24import sqlalchemy as sa
29 25
26# revision identifiers, used by Alembic.
27revision = '012'
28down_revision = '011'
30 29
31MYSQL_ENGINE = 'InnoDB' 30MYSQL_ENGINE = 'InnoDB'
32MYSQL_CHARSET = 'utf8' 31MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py b/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py
index 5140d56..b6c0ce4 100644
--- a/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py
+++ b/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py
@@ -21,14 +21,14 @@ Create Date: 2016-04-12 15:46:12.251155
21 21
22""" 22"""
23 23
24# revision identifiers, used by Alembic.
25revision = '013'
26down_revision = '012'
27
28from alembic import op 24from alembic import op
29import sqlalchemy as sa 25import sqlalchemy as sa
30import sqlalchemy.dialects.mysql as sa_mysql 26import sqlalchemy.dialects.mysql as sa_mysql
31 27
28# revision identifiers, used by Alembic.
29revision = '013'
30down_revision = '012'
31
32MYSQL_ENGINE = 'InnoDB' 32MYSQL_ENGINE = 'InnoDB'
33MYSQL_CHARSET = 'utf8' 33MYSQL_CHARSET = 'utf8'
34 34
diff --git a/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py b/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py
index b0f01e4..9cd8043 100644
--- a/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py
+++ b/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py
@@ -20,13 +20,13 @@ Create Date: 2016-04-28
20 20
21""" 21"""
22 22
23from alembic import op
24import sqlalchemy.dialects.mysql as sa_mysql
25
23# revision identifiers, used by Alembic. 26# revision identifiers, used by Alembic.
24revision = '014' 27revision = '014'
25down_revision = '013' 28down_revision = '013'
26 29
27from alembic import op
28import sqlalchemy.dialects.mysql as sa_mysql
29
30MYSQL_ENGINE = 'InnoDB' 30MYSQL_ENGINE = 'InnoDB'
31MYSQL_CHARSET = 'utf8' 31MYSQL_CHARSET = 'utf8'
32 32
diff --git a/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py b/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py
index f8de8f6..c41c553 100644
--- a/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py
+++ b/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py
@@ -20,13 +20,12 @@ Create Date: 2016-06-17
20 20
21""" 21"""
22 22
23# revision identifiers, used by Alembic.
24revision = '015'
25down_revision = '014'
26
27from alembic import op 23from alembic import op
28import sqlalchemy as sa 24import sqlalchemy as sa
29 25
26# revision identifiers, used by Alembic.
27revision = '015'
28down_revision = '014'
30 29
31MYSQL_ENGINE = 'InnoDB' 30MYSQL_ENGINE = 'InnoDB'
32MYSQL_CHARSET = 'utf8' 31MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py b/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py
index 4353c0b..dcd916b 100644
--- a/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py
+++ b/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py
@@ -21,14 +21,14 @@ Create Date: 2016-08-30 10:45:00
21 21
22""" 22"""
23 23
24# revision identifiers, used by Alembic.
25revision = '016'
26down_revision = '015'
27
28from alembic import op 24from alembic import op
29import sqlalchemy as sa 25import sqlalchemy as sa
30import sqlalchemy.dialects.mysql as sa_mysql 26import sqlalchemy.dialects.mysql as sa_mysql
31 27
28# revision identifiers, used by Alembic.
29revision = '016'
30down_revision = '015'
31
32MYSQL_ENGINE = 'InnoDB' 32MYSQL_ENGINE = 'InnoDB'
33MYSQL_CHARSET = 'utf8' 33MYSQL_CHARSET = 'utf8'
34 34
diff --git a/murano/opts.py b/murano/opts.py
index 593a050..8151593 100644
--- a/murano/opts.py
+++ b/murano/opts.py
@@ -12,11 +12,6 @@
12# License for the specific language governing permissions and limitations 12# License for the specific language governing permissions and limitations
13# under the License. 13# under the License.
14 14
15__all__ = [
16 'list_opts',
17 'list_cfapi_opts',
18]
19
20import copy 15import copy
21import itertools 16import itertools
22from keystoneauth1 import loading as ks_loading 17from keystoneauth1 import loading as ks_loading
@@ -27,6 +22,11 @@ import murano.common.cf_config
27import murano.common.config 22import murano.common.config
28import murano.common.wsgi 23import murano.common.wsgi
29 24
25__all__ = [
26 'list_opts',
27 'list_cfapi_opts',
28]
29
30 30
31def build_list(opt_list): 31def build_list(opt_list):
32 return list(itertools.chain(*opt_list)) 32 return list(itertools.chain(*opt_list))