Skip to content

Commit 193d6ef

Browse files
committed
Merge branch '4.20' of https://github.com/apache/cloudstack
2 parents 55ca114 + a95e9d7 commit 193d6ef

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ jobs:
236236
237237
- name: Install Python dependencies
238238
run: |
239-
python3 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid
239+
python3 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid pynose
240240
241241
- name: Install jacoco dependencies
242242
run: |

systemvm/debian/opt/cloud/bin/cs/CsDhcp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def process(self):
8282
CsHelper.service("dnsmasq", "reload")
8383

8484
def configure_server(self):
85-
# self.conf.addeq("dhcp-hostsfile=%s" % DHCP_HOSTS)
85+
self.conf.add("bind-interfaces", 0)
8686
idx = 0
8787
listen_address = ["127.0.0.1"]
8888
for i in self.devinfo:

0 commit comments

Comments
 (0)