(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/common_services_fixtures.py b/tcp_tests/fixtures/common_services_fixtures.py
index eb46f93..21c0e5d 100644
--- a/tcp_tests/fixtures/common_services_fixtures.py
+++ b/tcp_tests/fixtures/common_services_fixtures.py
@@ -19,7 +19,6 @@
from tcp_tests import logger
from tcp_tests.helpers import ext
-from tcp_tests.helpers import utils
from tcp_tests import settings
from tcp_tests.managers import common_services_manager
@@ -72,7 +71,7 @@
# Create Salt cluster
if not config.common_services.common_services_installed:
steps_path = config.common_services_deploy.common_services_steps_path
- commands = utils.read_template(steps_path)
+ commands = underlay.read_template(steps_path)
common_services_actions.install(commands)
hardware.create_snapshot(ext.SNAPSHOT.common_services_deployed)