diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-07-19 12:41:17 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-07-19 14:56:10 -0400 |
| commit | 9dbe4eb096c7f20d4375bd298968f42a10914b0e (patch) | |
| tree | 6c0b3efc50214cfad8b0d6c6d4f3c4aeff9553d3 /lib/python/apex | |
| parent | 40925d0cdc63e557ef04569642875cd07b8ed7ce (diff) | |
Allows specifying domain name for overcloud/undercloud
Can be set by setting domain_name in network_settings. Defaults to
dummy opnfvapex.com.
JIRA: APEX-183
JIRA: APEX-182
Change-Id: Ib7c279a1c8432b8635f72e5cc667f16b9cd65159
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'lib/python/apex')
| -rw-r--r-- | lib/python/apex/common/constants.py | 1 | ||||
| -rw-r--r-- | lib/python/apex/network_settings.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/python/apex/common/constants.py b/lib/python/apex/common/constants.py index dfed33f8..996ef2f0 100644 --- a/lib/python/apex/common/constants.py +++ b/lib/python/apex/common/constants.py @@ -16,3 +16,4 @@ OPNFV_NETWORK_TYPES = [ADMIN_NETWORK, PRIVATE_NETWORK, PUBLIC_NETWORK, STORAGE_NETWORK, API_NETWORK] DNS_SERVERS = ["8.8.8.8", "8.8.4.4"] ROLES = ['compute', 'controller'] +DOMAIN_NAME = 'localdomain.com' diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py index fd6c1455..f2807664 100644 --- a/lib/python/apex/network_settings.py +++ b/lib/python/apex/network_settings.py @@ -75,6 +75,8 @@ class NetworkSettings: self.settings_obj['dns_servers'] = self.settings_obj.get( 'dns_servers', constants.DNS_SERVERS) + self.settings_obj['domain_name'] = self.settings_obj.get( + 'domain_name', constants.DOMAIN_NAME) def _validate_overcloud_nic_order(self, network): """ @@ -281,6 +283,8 @@ class NetworkSettings: dns_list = dns_list + "{} ".format(dns_server) dns_list = dns_list.strip() bash_str += "dns_servers=\'{}\'\n".format(dns_list) + bash_str += "domain_name=\'{}\'\n".format(self.settings_obj[ + 'domain_name']) if path: with open(path, 'w') as file: file.write(bash_str) |