From a693436f60f18fd1d5277fa307f462de4d75eb57 Mon Sep 17 00:00:00 2001 From: Taylor May Date: Wed, 26 Jul 2017 23:11:23 -0500 Subject: [PATCH] Allow setting the fuel master's FQDN and DNS settings from environment variables Change-Id: Ifd63b6459be7e7cf2f6896f390ed7fc0f0b7bf78 --- devops/models/node_ext/centos_master.py | 4 ++-- devops/models/node_ext/fuel_master.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devops/models/node_ext/centos_master.py b/devops/models/node_ext/centos_master.py index 3995a1dd..3633179e 100644 --- a/devops/models/node_ext/centos_master.py +++ b/devops/models/node_ext/centos_master.py @@ -67,8 +67,8 @@ class NodeExtension(object): " gateway {gateway}\n" + " dns-nameservers {dns}\n" "local-hostname: {hostname}".format( - dns=settings.DEFAULT_DNS, - hostname=settings.DEFAULT_MASTER_FQDN)) + dns=settings.MASTER_DNS, + hostname=settings.MASTER_FQDN)) if volume.cloudinit_user_data is None: volume.cloudinit_user_data = ( diff --git a/devops/models/node_ext/fuel_master.py b/devops/models/node_ext/fuel_master.py index 8ce7080f..92b654e4 100644 --- a/devops/models/node_ext/fuel_master.py +++ b/devops/models/node_ext/fuel_master.py @@ -44,8 +44,8 @@ class NodeExtension(object): ip=ip, mask=admin_ap.ip_network.netmask, gw=admin_ap.gateway, - hostname=settings.DEFAULT_MASTER_FQDN, - nameserver=settings.DEFAULT_DNS, + hostname=settings.MASTER_FQDN, + nameserver=settings.MASTER_DNS, ) self.node.send_keys(result_kernel_cmd)