apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.14' into 4.15

Browse Source
This commit is contained in:
Rohit Yadav 2021-04-05 12:59:37 +05:30
commit 43257f8300
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
systemvm/debian/etc/vpcdnsmasq.conf
View File

@ -462,3 +462,4 @@ log-facility=/var/log/dnsmasq.log
conf-dir=/etc/dnsmasq.d conf-dir=/etc/dnsmasq.d
dhcp-optsfile=/etc/dhcpopts.txt dhcp-optsfile=/etc/dhcpopts.txt
localise-queries

3
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
View File

@ -127,6 +127,9 @@ class CsDhcp(CsDataBag):
listen_address.append(gateway) listen_address.append(gateway)
else: else:
listen_address.append(ip) listen_address.append(ip)
# Add localized "data-server" records in /etc/hosts for VPC routers
if self.config.is_vpc():
self.add_host(gateway, "%s data-server" % CsHelper.get_hostname())
idx += 1 idx += 1
# Listen Address # Listen Address