diff --git a/.gitignore b/.gitignore index ddee84990..1a80f71c3 100644 --- a/.gitignore +++ b/.gitignore @@ -38,9 +38,10 @@ doc/source/api #Config file for functional tests murano/tests/functional/engine/config.conf -#Autogenerated sample config file +#Autogenerated sample config file and policy file etc/murano/murano.conf.sample etc/murano/murano-cfapi.conf.sample +etc/murano.policy.yaml.sample #User Config file for Murano etc/murano/murano.conf diff --git a/etc/oslo-policy-generator/murano-policy-generator.conf b/etc/oslo-policy-generator/murano-policy-generator.conf new file mode 100644 index 000000000..1d8544ea2 --- /dev/null +++ b/etc/oslo-policy-generator/murano-policy-generator.conf @@ -0,0 +1,3 @@ +[DEFAULT] +output_file = etc/murano.policy.yaml.sample +namespace = murano diff --git a/setup.cfg b/setup.cfg index ea8444bcd..431577620 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,14 +53,23 @@ console_scripts = murano-cfapi-db-manage = murano.cmd.cfapi_db_manage:main murano-test-runner = murano.cmd.test_runner:main murano-cfapi = murano.cmd.cfapi:main + wsgi_scripts = murano-wsgi-api = murano.httpd.murano_api:init_application + oslo.config.opts = murano = murano.opts:list_opts keystone_authtoken = keystonemiddleware.opts:list_auth_token_opts murano.cfapi = murano.opts:list_cfapi_opts + oslo.config.opts.defaults = murano = murano.common.config:set_middleware_defaults + +oslo.policy.policies = + # With the move of default policy in code list_rules returns a list of + # the default defined polices. + murano = murano.common.policies:list_rules + tempest.test_plugins = murano_tests = murano_tempest_tests.plugin:MuranoTempestPlugin diff --git a/tox.ini b/tox.ini index 755ae6450..d30325aa5 100644 --- a/tox.ini +++ b/tox.ini @@ -65,6 +65,9 @@ commands = commands = oslo-config-generator --config-file etc/oslo-config-generator/murano-cfapi.conf +[testenv:genpolicy] +commands = oslopolicy-sample-generator --config-file etc/oslo-policy-generator/murano-policy-generator.conf + [testenv:releasenotes] commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html