openstack
/
fuel-devops
Code Issues Proposed changes

Allow setting the fuel master's FQDN and DNS settings from environment variables 

Change-Id: Ifd63b6459be7e7cf2f6896f390ed7fc0f0b7bf78
This commit is contained in:
Taylor May 2017-07-26 23:11:23 -05:00
parent 88a5d02b3d
commit a693436f60
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devops/models/node_ext/centos_master.py
View File

@ -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 = (

4
devops/models/node_ext/fuel_master.py
View File

@ -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)