diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-09 19:45:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-09 19:45:34 +0000 |
| commit | 41584070516695ecdc412b25d1f90866cd78e30f (patch) | |
| tree | e81c4782702b690fb26b8ad3cbadc1a3c59debfe | |
| parent | cb843694f4b000b96c05bf0d08a0c17cdc8ff84e (diff) | |
| parent | 620939453658f89394a59979f7f6c8c0e1c8e836 (diff) | |
Merge "Enabling DNS server assignment in entwork settings"
| -rw-r--r-- | config/network/network_settings.yaml | 3 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index 88bb3b58..5614c64d 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -19,6 +19,9 @@ # See short description of the networks in the comments below. # +# DNS Servers for all nodes, comma delimited list +dns_servers: ["8.8.8.8", "8.8.4.4"] + # "admin" is the short name for Control Plane Network. # During OPNFV deployment it is used for node provisioning so # PXE boot should be enabled for the related interfaces on all diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index e6f0135a..03ecf06a 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -78,6 +78,7 @@ class NetworkEnvironment: net_settings[constants.PUBLIC_NETWORK]['gateway'] self.netenv_obj[param_def]['EC2MetadataIp'] = \ net_settings[constants.ADMIN_NETWORK]['provisioner_ip'] + self.netenv_obj[param_def]['DnsServers'] = net_settings['dns_servers'] if constants.PRIVATE_NETWORK in enabled_networks: priv_range = net_settings[constants.PRIVATE_NETWORK][ |