Merge pull request #17 from rackerlabs/config_dir

feat: parse meta_data.json and set hostname

Author: cardoe

README.md

@@ -54,7 +54,7 @@ non-interactive.
 
 ```bash
 # using uvx
-uvx esxi-image --output esxi.img path/to/esxi.iso
+uvx esxi-img --output esxi.img path/to/esxi.iso
 
 # using pip
 python -m venv .venv

packages/esxi-netinit/doc/meta_data.json

@@ -0,0 +1,39 @@
+{
+   "random_seed": "yu5ZnkqF2CqnDZVAfZgarG...",
+   "availability_zone": "nova",
+   "keys": [
+       {
+         "data": "ssh-rsa AAAAB3NzaC1y...== Generated by Nova\n",
+         "type": "ssh",
+         "name": "mykey"
+       }
+   ],
+   "hostname": "test.novalocal",
+   "launch_index": 0,
+   "meta": {
+      "priority": "low",
+      "role": "webserver"
+   },
+   "devices": [
+       {
+         "type": "nic",
+         "bus": "pci",
+         "address": "0000:00:02.0",
+         "mac": "00:11:22:33:44:55",
+         "tags": ["trusted"]
+       },
+       {
+         "type": "disk",
+         "bus": "ide",
+         "address": "0:0",
+         "serial": "disk-vol-2352423",
+         "path": "/dev/sda",
+         "tags": ["baz"]
+       }
+   ],
+   "project_id": "f7ac731cc11f40efbc03a9f9e1d1d21f",
+   "public_keys": {
+       "mykey": "ssh-rsa AAAAB3NzaC1y...== Generated by Nova\n"
+   },
+   "name": "test"
+}

packages/esxi-netinit/doc/example.json renamed to packages/esxi-netinit/doc/network_data.json

@@ -2,6 +2,7 @@
 from functools import cached_property
 
 from .esxhost import ESXHost
+from .meta_data import MetaDataData
 from .network_data import NetworkData
 from .nic import NIC
 from .nic_list import NICList
@@ -10,11 +11,17 @@
 
 
 class ESXConfig:
-    def __init__(self, network_data: NetworkData, dry_run=False) -> None:
+    def __init__(
+        self, network_data: NetworkData, meta_data: MetaDataData, dry_run=False
+    ) -> None:
         self.network_data = network_data
+        self.meta_data = meta_data
         self.dry_run = dry_run
         self.host = ESXHost(dry_run)
 
+    def configure_hostname(self):
+        self.host.set_hostname(self.meta_data.metadata.hostname)
+
     def clean_default_network_setup(self, portgroup_name, switch_name):
         """Removes default networking setup left by the installer."""
         self.host.delete_vmknic(portgroup_name=portgroup_name)

packages/esxi-netinit/esxi_netinit/esxconfig.py

@@ -18,6 +18,17 @@ def __execute(self, cmd: list):
             logger.debug("Executing %s", cmd)
             subprocess.run(cmd, check=True)  # noqa: S603
 
+    def set_hostname(self, hostname: str):
+        cmd = [
+            "/bin/esxcli",
+            "system",
+            "hostname",
+            "set",
+            "--fqdn",
+            hostname,
+        ]
+        return self.__execute(cmd)
+
     def add_ip_interface(self, inf: str, portgroup_name: str, mac: str, mtu: int):
         """Adds IP interface."""
         logger.info(

packages/esxi-netinit/esxi_netinit/esxhost.py

@@ -3,8 +3,10 @@
 import logging.handlers
 import os
 import sys
+from pathlib import Path
 
 from esxi_netinit.esxconfig import ESXConfig
+from esxi_netinit.meta_data import MetaDataData
 from esxi_netinit.network_data import NetworkData
 
 OLD_MGMT_PG = "Management Network"
@@ -38,9 +40,24 @@ def setup_logger(log_level=logging.INFO):
         logger.error("Failed to setup syslog for logging")
 
 
-def main(json_file, dry_run):
-    network_data = NetworkData.from_json_file(json_file)
-    esx = ESXConfig(network_data, dry_run=dry_run)
+def main(config_dir, dry_run):
+    config_path = Path(config_dir)
+    network_data_file = config_path / "network_data.json"
+    meta_data_file = config_path / "meta_data.json"
+
+    if not network_data_file.exists():
+        logger.error("Missing network_data.json in %s", config_dir)
+        sys.exit(1)
+
+    if not meta_data_file.exists():
+        logger.error("Missing meta_data.json in %s", config_dir)
+        sys.exit(1)
+
+    network_data = NetworkData.from_json_file(network_data_file)
+    meta_data = MetaDataData.from_json_file(meta_data_file)
+
+    esx = ESXConfig(network_data, meta_data, dry_run=dry_run)
+    esx.configure_hostname()
     esx.clean_default_network_setup(OLD_MGMT_PG, OLD_VSWITCH)
     esx.configure_vswitch(
         uplink=esx.identify_uplink(), switch_name=NEW_VSWITCH, mtu=9000
@@ -56,7 +73,11 @@ def main(json_file, dry_run):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Network configuration script")
-    parser.add_argument("json_file", help="Path to the JSON configuration file")
+    parser.add_argument(
+        "config_dir",
+        help="Path to the configuration dir containing "
+        "network_data.json, meta_data.json",
+    )
     parser.add_argument(
         "--dry-run",
         action="store_true",
@@ -67,7 +88,7 @@ def main(json_file, dry_run):
     setup_logger()
 
     try:
-        main(args.json_file, args.dry_run)
+        main(args.config_dir, args.dry_run)
     except Exception:
         logger.exception("Error configuring network")
         sys.exit(1)

packages/esxi-netinit/esxi_netinit/main.py

@@ -0,0 +1,28 @@
+import json
+import logging
+
+from esxi_netinit.metadata import MetaData
+
+logger = logging.getLogger(__name__)
+
+
+class MetaDataData:
+    """Represents meta_data.json."""
+
+    def __init__(self, data: dict) -> None:
+        self.metadata = MetaData(
+            uuid=data["uuid"],
+            hostname=data["hostname"],
+            availability_zone=data.get("availability_zone"),
+            public_keys=data.get("public_keys", {}),
+            admin_pass=data["admin_pass"],
+            project_id=data["project_id"],
+            random_seed=data["random_seed"],
+            launch_index=data["launch_index"],
+        )
+
+    @staticmethod
+    def from_json_file(path):
+        with open(path) as f:
+            data = json.load(f)
+            return MetaDataData(data)

packages/esxi-netinit/esxi_netinit/meta_data.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass
+from dataclasses import field
+from typing import Dict
+from typing import Optional
+
+
+@dataclass
+class MetaData:
+    uuid: str
+    admin_pass: str
+    hostname: str
+    project_id: str
+    random_seed: str
+    launch_index: Optional[int] = 0
+    availability_zone: Optional[str] = None
+    meta: Dict[str, str] = field(default_factory=dict)
+    public_keys: Dict[str, str] = field(default_factory=dict)
+    devices: "list | None" = field(default=None)
+    dedicated_cpus: "list | None" = field(default=None)

packages/esxi-netinit/esxi_netinit/metadata.py

@@ -19,3 +19,8 @@ def network_data_single():
 @pytest.fixture
 def network_data_multi():
     return _load_json(THIS_DIR / "data" / "net_data_multi.json")
+
+
+@pytest.fixture
+def meta_data():
+    return _load_json(THIS_DIR / "data" / "meta_data.json")

packages/esxi-netinit/tests/conftest.py

@@ -0,0 +1,41 @@
+{
+  "uuid": "47bb4c37-f60d-474f-8ce5-c7c1d9982585",
+   "random_seed": "yu5ZnkqF2CqnDZVAfZgarG...",
+   "availability_zone": "nova",
+  "admin_pass": "changeit",
+   "keys": [
+       {
+         "data": "ssh-rsa AAAAB3NzaC1y...== Generated by Nova\n",
+         "type": "ssh",
+         "name": "mykey"
+       }
+   ],
+   "hostname": "test.novalocal",
+   "launch_index": 0,
+   "meta": {
+      "priority": "low",
+      "role": "webserver"
+   },
+   "devices": [
+       {
+         "type": "nic",
+         "bus": "pci",
+         "address": "0000:00:02.0",
+         "mac": "00:11:22:33:44:55",
+         "tags": ["trusted"]
+       },
+       {
+         "type": "disk",
+         "bus": "ide",
+         "address": "0:0",
+         "serial": "disk-vol-2352423",
+         "path": "/dev/sda",
+         "tags": ["baz"]
+       }
+   ],
+   "project_id": "f7ac731cc11f40efbc03a9f9e1d1d21f",
+   "public_keys": {
+       "mykey": "ssh-rsa AAAAB3NzaC1y...== Generated by Nova\n"
+   },
+   "name": "test"
+}