Compare commits
2 Commits
eff972a62e
...
c331091cdd
| Author | SHA1 | Date | |
|---|---|---|---|
| c331091cdd | |||
| dfc8d598cb |
@@ -485,6 +485,7 @@ class VMBuilderScript(VMBuilder):
|
|||||||
"acpid",
|
"acpid",
|
||||||
"acpi-support-base",
|
"acpi-support-base",
|
||||||
"wget",
|
"wget",
|
||||||
|
"isc-dhcp-server", # required for cloud-init on Debian 13+ where this is no longer standard
|
||||||
]
|
]
|
||||||
|
|
||||||
# We need to know our root disk for later GRUB-ing
|
# We need to know our root disk for later GRUB-ing
|
||||||
|
|||||||
@@ -130,21 +130,25 @@ def read_lease_database(zk_conn, zk_leases_key):
|
|||||||
def add_lease(zk_conn, zk_leases_key, expiry, macaddr, ipaddr, hostname, clientid):
|
def add_lease(zk_conn, zk_leases_key, expiry, macaddr, ipaddr, hostname, clientid):
|
||||||
if not hostname:
|
if not hostname:
|
||||||
hostname = ""
|
hostname = ""
|
||||||
transaction = zk_conn.transaction()
|
try:
|
||||||
transaction.create("{}/{}".format(zk_leases_key, macaddr), "".encode("ascii"))
|
zk_conn.delete("{}/{}".format(zk_leases_key, macaddr), recursive=True)
|
||||||
transaction.create(
|
transaction = zk_conn.transaction()
|
||||||
"{}/{}/expiry".format(zk_leases_key, macaddr), expiry.encode("ascii")
|
transaction.create("{}/{}".format(zk_leases_key, macaddr), "".encode("ascii"))
|
||||||
)
|
transaction.create(
|
||||||
transaction.create(
|
"{}/{}/expiry".format(zk_leases_key, macaddr), expiry.encode("ascii")
|
||||||
"{}/{}/ipaddr".format(zk_leases_key, macaddr), ipaddr.encode("ascii")
|
)
|
||||||
)
|
transaction.create(
|
||||||
transaction.create(
|
"{}/{}/ipaddr".format(zk_leases_key, macaddr), ipaddr.encode("ascii")
|
||||||
"{}/{}/hostname".format(zk_leases_key, macaddr), hostname.encode("ascii")
|
)
|
||||||
)
|
transaction.create(
|
||||||
transaction.create(
|
"{}/{}/hostname".format(zk_leases_key, macaddr), hostname.encode("ascii")
|
||||||
"{}/{}/clientid".format(zk_leases_key, macaddr), clientid.encode("ascii")
|
)
|
||||||
)
|
transaction.create(
|
||||||
transaction.commit()
|
"{}/{}/clientid".format(zk_leases_key, macaddr), clientid.encode("ascii")
|
||||||
|
)
|
||||||
|
transaction.commit()
|
||||||
|
except Exception as e:
|
||||||
|
print(f"FATAL: {e}")
|
||||||
|
|
||||||
|
|
||||||
def del_lease(zk_conn, zk_leases_key, macaddr, expiry):
|
def del_lease(zk_conn, zk_leases_key, macaddr, expiry):
|
||||||
|
|||||||
Reference in New Issue
Block a user