Skip to content

Commit

Permalink
Fixed a curtin-hook error by rewriting
Browse files Browse the repository at this point in the history
the exec_prog function which was preventing
ESXi 7/8 deployments.

Updated PIP requirements.txt to prevent
build errors.

Updated README.md to include the default
password.
  • Loading branch information
alanbach committed Dec 3, 2023
1 parent 37b6046 commit b07f319
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
3 changes: 3 additions & 0 deletions vmware-esxi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ maas $PROFILE boot-resources create \
architecture='amd64/generic' filetype='ddgz' \
content@=vmware-esxi.dd.gz
```
## Default Credentials

The default username is ```root``` and the default password is set to ```password123!```

## Known limitations

Expand Down
25 changes: 16 additions & 9 deletions vmware-esxi/curtin/curtin-hooks
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,19 @@ from curtin.log import LOG
from curtin.util import load_command_environment


def exec_prog(*cmdline: str) -> None:
subprocess.check_call(
cmdline,
stdout=subprocess.DEVNULL,
stderr=subprocess.STDOUT,
)
def exec_prog(command):
try:
result = subprocess.run(command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True, shell=True)

if result.returncode == 0:
LOG.info(result.stdout)
else:
print("Error:\n", result.stderr)
except Exception as e:
print(f"Exception: {e}")


def write_config(target, config):
Expand Down Expand Up @@ -67,11 +74,11 @@ def write_config(target, config):
LOG.info("altbootbank found at %s", altbootbank_blkdev)

altbootbank_mount_point = tempfile.mkdtemp(prefix="curtin-hooks-")
exec_prog("mount", altbootbank_blkdev, altbootbank_mount_point)
exec_prog(f"mount {altbootbank_blkdev} {altbootbank_mount_point}")

scripts_pkg = os.path.join(os.path.dirname(__file__), "scripts.tar.xz")
LOG.info("MAAS scripts found at %s", scripts_pkg)
exec_prog("tar", "xJf", scripts_pkg, "-C", altbootbank_mount_point)
exec_prog(f"tar xJf {scripts_pkg} -C {altbootbank_mount_point}")
os.remove(scripts_pkg)

curtin_cfg_path = os.path.join(
Expand All @@ -82,7 +89,7 @@ def write_config(target, config):

LOG.info("wrote Curtin config to %s", curtin_cfg_path)

exec_prog("umount", altbootbank_mount_point)
exec_prog(f"umount {altbootbank_mount_point}")


def cleanup():
Expand Down
4 changes: 2 additions & 2 deletions vmware-esxi/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ipaddr==2.2.0
oauthlib==3.1.0
PyYAML==5.4.1
oauthlib==3.2.2
PyYAML==6.0.1
requests==2.31.0

0 comments on commit b07f319

Please sign in to comment.