x
/
fuel-ccp-tests
Code Issues Proposed changes

Use local DNS server for kubernetes by default 

Change-Id: I2e16b1b86b020f10ee25dea47443751c49770ad4
This commit is contained in:
Artem Panchenko 2016-09-21 11:26:18 +03:00
parent 7e49f05f54
commit 49359a3617
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_ccp_tests/managers/envmanager_devops.py
View File

@ -449,3 +449,5 @@ class EnvironmentManager(object):
# Set local nameserver to use by default
if not self.__config.underlay.nameservers:
self.__config.underlay.nameservers = [self.nameserver]
if not self.__config.underlay.upstream_dns_servers:
self.__config.underlay.upstream_dns_servers = [self.nameserver]

18
fuel_ccp_tests/managers/k8smanager.py
View File

@ -300,10 +300,14 @@ class K8SManager(object):
LOG.info(result['stdout'])
def set_dns(self, k8s_settings):
if 'nameservers' in k8s_settings:
return
if not self.__config.underlay.nameservers:
return
k8s_settings['nameservers'] = self.__config.underlay.nameservers
LOG.info('Added custom DNS servers to the settings: '
'{0}'.format(k8s_settings['nameservers']))
if 'nameservers' not in k8s_settings and \
self.__config.underlay.nameservers:
k8s_settings['nameservers'] = self.__config.underlay.nameservers
LOG.info('Added custom DNS servers to the settings: '
'{0}'.format(k8s_settings['nameservers']))
if 'upstream_dns_servers' not in k8s_settings and \
self.__config.underlay.upstream_dns_servers:
k8s_settings['upstream_dns_servers'] = \
self.__config.underlay.upstream_dns_servers
LOG.info('Added custom upstream DNS servers (dnsmasq) to the '
'settings: {0}'.format(k8s_settings['nameservers']))

4
fuel_ccp_tests/settings.py
View File

@ -68,9 +68,6 @@ HYPERKUBE_IMAGE_TAG = os.environ.get('HYPERKUBE_IMAGE_TAG', "{}_coreos.0"
ETCD_IMAGE_REPO = os.environ.get('ETCD_IMAGE_REPO', "quay.io/coreos/etcd")
ETCD_IMAGE_TAG = os.environ.get("ETCD_IMAGE_TAG", 'v3.0.1')
ETCD_DEPLOYMENT_TYPE = os.environ.get('ETCD_DEPLOYMENT_TYPE', "docker")
# For dnsmasq purposes
UPSTREAM_DNS = os.environ.get('UPSTREAM_DNS', '8.8.8.8').split(',')
# For resolv.conf entries
SERVICE_PATH = os.environ.get('SERVICE_PATH')
TEMPEST_SCRIPT_PATH = os.environ.get('TEMPEST_SCRIPT_PATH')
@ -97,7 +94,6 @@ DEFAULT_CUSTOM_YAML = {
"ipip": IPIP_USAGE,
"kube_version": KUBE_VERSION,
"use_hyperkube_cni": str("true"),
"upstream_dns_servers": UPSTREAM_DNS,
"searchdomains": SEARCH_DOMAINS,
}

3
fuel_ccp_tests/settings_oslo.py
View File

@ -55,6 +55,9 @@ underlay_opts = [
ct.Cfg('nameservers', ct.JSONList(),
help="IP addresses of DNS servers",
default=[]),
ct.Cfg('upstream_dns_servers', ct.JSONList(),
help="IP addresses of upstream DNS servers (dnsmasq)",
default=[]),
ct.Cfg('lvm', ct.JSONDict(),
help="LVM settings for Underlay"),
]

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

@ -128,7 +128,6 @@ class TestAppController(object):
kube_settings = {
"hyperkube_image_repo": settings.HYPERKUBE_IMAGE_REPO,
"hyperkube_image_tag": settings.HYPERKUBE_IMAGE_TAG,
"upstream_dns_servers": settings.UPSTREAM_DNS,
"searchdomains": settings.SEARCH_DOMAINS,
"use_hyperkube_cni": str("true"),
}

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

@ -37,7 +37,6 @@ class TestPreStackLight(object):
kube_settings = {
"hyperkube_image_repo": settings.HYPERKUBE_IMAGE_REPO,
"hyperkube_image_tag": settings.HYPERKUBE_IMAGE_TAG,
"upstream_dns_servers": settings.UPSTREAM_DNS,
"searchdomains": settings.SEARCH_DOMAINS,
"use_hyperkube_cni": str("true"),
}