Remove legacy templates dir: /etc/vitrage/templates
Change-Id: I1deddc74c49af5e4483c7d2dfac2bf4d8c123890 Depends-On: I03b681127870adefe65f7580a8b683b62bcf7f89
This commit is contained in:
parent
fbc10899f7
commit
6c98acf356
@ -29,16 +29,6 @@ if [ "$DEVSTACK_GATE_USE_PYTHON3" == "True" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
sudo cp -rf $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf
|
sudo cp -rf $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf
|
||||||
|
|
||||||
${PYTHON:-python} $DEVSTACK_PATH/vitrage-tempest-plugin/vitrage_tempest_tests/add_legacy_dir_templates.py
|
|
||||||
|
|
||||||
# restart due to configuration files changes
|
|
||||||
sudo systemctl restart devstack@vitrage-graph.service
|
|
||||||
|
|
||||||
# wait for 30 seconds (initialization might take time)
|
|
||||||
sleep 30
|
|
||||||
|
|
||||||
|
|
||||||
cd $DEVSTACK_PATH/tempest/
|
cd $DEVSTACK_PATH/tempest/
|
||||||
sudo -E testr init
|
sudo -E testr init
|
||||||
|
|
||||||
|
@ -18,18 +18,6 @@ from vitrage.evaluator.template_schemas import init_template_schemas
|
|||||||
|
|
||||||
# Register options for the service
|
# Register options for the service
|
||||||
OPTS = [
|
OPTS = [
|
||||||
cfg.StrOpt('templates_dir',
|
|
||||||
default='/etc/vitrage/templates',
|
|
||||||
help='A path for the templates used by the evaluator'
|
|
||||||
),
|
|
||||||
cfg.StrOpt('equivalences_dir',
|
|
||||||
default='/etc/vitrage/templates/equivalences',
|
|
||||||
help='A path for entity equivalences used by the evaluator'
|
|
||||||
),
|
|
||||||
cfg.StrOpt('def_templates_dir',
|
|
||||||
default='/etc/vitrage/templates/def_templates',
|
|
||||||
help='A path for def_template templates used by the evaluator'
|
|
||||||
),
|
|
||||||
cfg.IntOpt('workers',
|
cfg.IntOpt('workers',
|
||||||
default=None,
|
default=None,
|
||||||
min=1,
|
min=1,
|
||||||
|
@ -23,8 +23,6 @@ from vitrage.evaluator.template_db.template_repository import \
|
|||||||
from vitrage import storage
|
from vitrage import storage
|
||||||
from vitrage.storage.sqlalchemy import models
|
from vitrage.storage.sqlalchemy import models
|
||||||
|
|
||||||
TEMPLATE_DIR = '/etc/vitrage/templates'
|
|
||||||
|
|
||||||
|
|
||||||
class TestConfiguration(object):
|
class TestConfiguration(object):
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user