(WIP) Use dynamic IPv4 network pools for deploy clusters (#18)
* Use dynamic IPv4 network pools for deploy clusters
- Use 'config' object as an additional jinja option to load templates
- Use 'address_pools' from 'config' object in
virtual-mcp11-ovs and virtual-mcp11-dvr
- Fill 'address_pools' in 'config' object from fuel-devops manager
* Use dynamic IPv4 network pools for deploy clusters
- Use 'config' object as an additional jinja option to load templates
- Use 'address_pools' from 'config' object in
virtual-mcp11-ovs and virtual-mcp11-dvr
- Fill 'address_pools' in 'config' object from fuel-devops manager
* return removed 'test_install_k8s'
* Use 'sed' to replace IP addresses in the models to pre-generated
also, two new environment variables avaliable for mcp11-ovs/dvr:
- SALT_MODELS_REPOSITORY
- SALT_MODELS_COMMIT
* remove temporary env_config.py.bak
diff --git a/tcp_tests/fixtures/underlay_fixtures.py b/tcp_tests/fixtures/underlay_fixtures.py
index d7351bf..43024e3 100644
--- a/tcp_tests/fixtures/underlay_fixtures.py
+++ b/tcp_tests/fixtures/underlay_fixtures.py
@@ -137,17 +137,16 @@
and snapshot_needed:
snapshot_name = utils.extract_name_from_mark(snapshot_needed) or \
"{}_passed".format(default_snapshot_name)
- hardware.create_snapshot(snapshot_name)
elif hasattr(request.node, 'rep_setup') and \
request.node.rep_setup.failed and fail_snapshot:
snapshot_name = "{0}_prep_failed".format(default_snapshot_name)
- hardware.create_snapshot(snapshot_name)
elif hasattr(request.node, 'rep_call') and \
request.node.rep_call.failed and fail_snapshot:
snapshot_name = "{0}_failed".format(default_snapshot_name)
- hardware.create_snapshot(snapshot_name)
+
+ hardware.create_snapshot(snapshot_name)
request.addfinalizer(test_fin)