x
/
fuel-ccp-tests
Code Issues Proposed changes

Fix "NAMESERVERS" environment variable usage in tests. 

1. Delete "nameservers" from kube_settings in test_stacklight.py
  2. Delete "nameservers" from kube_settings in test_appcontroller.py
  3. Delete appropriate variable NAMESERVERS in settings.py
  4. Use yaml.safe_dump instead of yaml.dump while dumping custom_yaml

Change-Id: I46937d29330079aae5b8350414a5cb9731997817
This commit is contained in:
Sergey Lebedev 2016-09-19 10:48:58 +03:00
parent 1c12dc5620
commit 2b72da562d
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_ccp_tests/managers/k8smanager.py
View File

@ -114,7 +114,7 @@ class K8SManager(object):
if custom_yaml:
self.set_dns(custom_yaml)
environment_variables.update(
{"CUSTOM_YAML": yaml.dump(
{"CUSTOM_YAML": yaml.safe_dump(
custom_yaml, default_flow_style=False)}
)
if env_var:

2
fuel_ccp_tests/settings.py
View File

@ -109,8 +109,6 @@ IMAGES_NAMESPACE = os.environ.get('IMAGES_NAMESPACE', 'mcp')
IMAGES_TAG = os.environ.get('IMAGES_TAG', 'latest')
# For dnsmasq purposes
UPSTREAM_DNS = os.environ.get('UPSTREAM_DNS', '8.8.8.8').split(',')
# For resolv.conf entries
NAMESERVERS = os.environ.get('NAMESERVERS', '8.8.8.8').split(',')
SERVICE_PATH = os.environ.get('SERVICE_PATH')
TEMPEST_SCRIPT_PATH = os.environ.get('TEMPEST_SCRIPT_PATH')
SEARCH_DOMAINS = os.environ.get('SEARCH_DOMAINS',

1
fuel_ccp_tests/tests/component/k8s/test_appcontroller.py
View File

@ -129,7 +129,6 @@ class TestAppController(object):
"hyperkube_image_repo": settings.HYPERKUBE_IMAGE_REPO,
"hyperkube_image_tag": settings.HYPERKUBE_IMAGE_TAG,
"upstream_dns_servers": settings.UPSTREAM_DNS,
"nameservers": settings.NAMESERVERS,
"searchdomains": settings.SEARCH_DOMAINS,
"use_hyperkube_cni": str("true"),
}

15
fuel_ccp_tests/tests/system/pre_commit/test_stacklight.py
View File

@ -38,7 +38,6 @@ class TestPreStackLight(object):
"hyperkube_image_repo": settings.HYPERKUBE_IMAGE_REPO,
"hyperkube_image_tag": settings.HYPERKUBE_IMAGE_TAG,
"upstream_dns_servers": settings.UPSTREAM_DNS,
"nameservers": settings.NAMESERVERS,
"searchdomains": settings.SEARCH_DOMAINS,
"use_hyperkube_cni": str("true"),
}
@ -50,13 +49,13 @@ class TestPreStackLight(object):
"""
Scenario:
1. Install k8s
2. Install fuel-ccp
3. Fetch all repositories
4. Fetch stacklight from review
5. Fetch repositories
6. Build containers
7. Deploy stack Light and openstack
8. Run verification
2. Install fuel-ccp
3. Fetch all repositories
4. Fetch stacklight from review
5. Fetch repositories
6. Build containers
7. Deploy stack Light and openstack
8. Run verification
"""