Updating cloud-init config files and base image

Signed-off-by: Adarsh Agrawal <[email protected]>

Author: adarshagrawal38

base-image/Containerfile

@@ -4,9 +4,3 @@ RUN dnf -y install cloud-init && \
     ln -s ../cloud-init.target /usr/lib/systemd/system/default.target.wants && \
     rm -rf /var/{cache,log} /var/lib/{dnf,rhsm}
 COPY usr/ /usr/
-
-COPY base_config.sh /usr/bin/
-COPY base_config.service /etc/systemd/system
-
-RUN systemctl unmask base_config.service
-RUN systemctl enable base_config.service

base-image/README.md

@@ -9,7 +9,7 @@ There are three distros of bootc image available to use. CentOS, Fedora and RHEL
 
     **Note:**
     - You need Red Hat account to get the credentials to pull the image. 
-    - Need to build the image on RHEL machine where subsciption activated.
+    - Need to build the image on RHEL machine where subscription activated.
 
 - CentOS and Fedora bootc images are available in Open Source, you can consume from their quay registry. If you want to use the CentOS/Fedora, ensure to replace the `FROM` image in [Containerfile](Containerfile)
     - [CentOS](https://quay.io/repository/centos-bootc/centos-bootc) - i.e. `quay.io/centos-bootc/centos-bootc:stream10`
@@ -22,16 +22,6 @@ RUN dnf -y install cloud-init && \
     rm -rf /var/{cache,log} /var/lib/{dnf,rhsm}
 COPY usr/ /usr/
 ```
-Install cloud-init to configure AI image and PIM partition's network and user
-
-```Dockerfile
-COPY base_config.sh /usr/bin/
-COPY base_config.service /etc/systemd/system
-
-RUN systemctl unmask base_config.service
-RUN systemctl enable base_config.service
-```
-systemd service to setup pimconfig like copying cloud init config and pim config files to respective directory
 
 ## Build
 

base-image/base_config.service

@@ -0,0 +1,10 @@
+version: 2
+ethernets:
+  env{{ config["partition"]["network"]["slot_num"] }}:
+    dhcp4: false
+    addresses:
+      - {{ config["partition"]["network"]["ip"]["address"] }}/{{ config["partition"]["network"]["ip"]["prefix-length"] }}
+    gateway4: {{ config["partition"]["network"]["ip"]["gateway"] }}
+    nameservers:
+      addresses:
+        - {{ config["partition"]["network"]["ip"]["nameserver"] }}

base-image/base_config.sh

@@ -0,0 +1,26 @@
+#cloud-config
+users:
+  - name: {{ config["ssh"]["user-name"] }}
+    sudo: ['ALL=(ALL) NOPASSWD:ALL']
+    lock_passwd: true
+    groups: sudo
+    shell: /bin/bash
+    ssh_authorized_keys:
+      - {{ config["ssh"]["pub-key"] }}
+
+write_files:
+  - path: /etc/pim/pim_config.json
+    content: |
+      {{ config["ai"]["config-json"] }}
+    owner: root:root
+    permissions: '0644'
+  - path: /etc/pim/auth.json
+    content: |
+      {{ config["ai"]["auth-json"] }}
+    owner: root:root
+    permissions: '0644'
+  - path: /etc/pim/env.conf
+    content: |
+      REGISTRY_AUTH_FILE=/etc/pim/auth.json
+    owner: root:root
+    permissions: '0644'

cli/cloud-init-iso/templates/99_custom_network.cfg

@@ -29,34 +29,44 @@ def generate_cloud_init_iso_config(config, slot_num, config_dir):
     file_loader = FileSystemLoader(f'{common.getclidir()}/cloud-init-iso/templates')
     env = Environment(loader=file_loader)
 
-    network_config_template = env.get_template('99_custom_network.cfg')
+    network_config_template = env.get_template('network-config')
     network_config_output = network_config_template.render(config=config)
 
-    common.create_dir(config_dir)
-
     pim_config_json = config["ai"]["config-json"] if config["ai"]["config-json"] != "" else "{}"
     pim_config_json = json.loads(pim_config_json)
 
     # 'workloadImage' is being used inside the bootstrap iso to write the bootc image into disk, in case of modification of this field name, needs same modification in bootstrap.iso too.
     pim_config_json["workloadImage"] = get_workload_image(config)
+    config["ai"]["config-json"] = json.dumps(pim_config_json, separators=(',', ':'))
+
+    auth_json = config["ai"]["auth-json"]
+    if auth_json == "":
+        auth_json = "{}"
+    else:
+        auth_data = json.loads(auth_json)
+        auth_json = json.dumps(auth_data, separators=(',', ':'))
+    config["ai"]["auth-json"] = auth_json
 
-    pim_config_file = open(config_dir + "/pim_config.json", "w")
-    pim_config_file.write(json.dumps(pim_config_json))
+    user_data_template = env.get_template('user-data')
+    user_data_output = user_data_template.render(config=config)
+
+    common.create_dir(config_dir)
 
-    network_config_file = open(
-        config_dir + "/99_custom_network.cfg", "w")
+    network_config_file = open(config_dir + "/network-config", "w")
     network_config_file.write(network_config_output)
+    
+    user_data_file = open(config_dir + "/user-data", "w")
+    user_data_file.write(user_data_output)
 
-    auth_json = "{}" if config["ai"]["auth-json"] == "" else config["ai"]["auth-json"]
-    auth_config_file = open(config_dir + "/auth.json", "w")
-    auth_config_file.write(auth_json)
+    open(config_dir+"/meta-data", "w")
+        
     logger.debug("Generated config files for the cloud-init ISO")
 
 
 def generate_cloud_init_iso_file(iso_dir, config, config_dir):
     logger.debug("Generating cloud-init ISO file")
     cloud_init_image_name = get_cloud_init_iso(config)
-    generate_cmd = f"mkisofs -l -o {iso_dir}/{cloud_init_image_name} {config_dir}"
+    generate_cmd = f"mkisofs -l -volid cidata -joliet -o {iso_dir}/{cloud_init_image_name} -rock {config_dir}"
 
     try:
         subprocess.run(generate_cmd.split(), check=True, capture_output=True)

cli/cloud-init-iso/templates/network-config

@@ -9,48 +9,7 @@
 logger = common.get_logger("monitor")
 
 
-def monitor_pim_boot(config):
-    # Re-run scenario: If lpar is in 2nd boot stage, check base_config service logs
-    logger.debug("PIM boot: Checking base_config.service")
-    try:
-        ssh_client = common.ssh_to_partition(config)
-
-        base_config_svc_exists = "ls /etc/systemd/system/base_config.service"
-        _, stdout, _ = ssh_client.exec_command(
-            base_config_svc_exists, get_pty=True)
-        if stdout.channel.recv_exit_status() == 0:
-            logger.debug("base_config.service exists")
-
-            logger.debug("Checking base_config.service logs")
-            base_cfg_svc_cmd = "sudo journalctl -u base_config.service -f 2>&1 | awk '{print} /base_config.sh run successfully/ {print \"Match found: \" $0; exit 0}'"
-            _, stdout, _ = ssh_client.exec_command(
-                base_cfg_svc_cmd, get_pty=True)
-            while True:
-                out = stdout.readline()
-                logger.debug(out)
-                if stdout.channel.exit_status_ready():
-                    if stdout.channel.recv_exit_status() == 0:
-                        logger.debug(
-                            "Found 'base_config.sh run successfully' message")
-                        ssh_client.close()
-                        return
-                if "base_config.service: Failed with result 'exit-code'" in out:
-                    ssh_client.close()
-                    logger.error(f"failed to start AI application. error: {out}")
-                    raise Exception(f"failed to start AI application. error: {out}")
-        else:
-            ssh_client.close()
-            logger.error(
-                "failed to find '/etc/systemd/system/base_config.service', please check console for more possible errors")
-            raise Exception(
-                "failed to  find '/etc/systemd/system/base_config.service', please check console for more possible errors")
-    except Exception as e:
-        logger.error(f"failed to monitor PIM boot, error: {e}")
-        raise Exception(f"failed to monitor PIM boot, error: {e}")
-
-
 def monitor_pim(config):
-    monitor_pim_boot(config)
     logger.info("Partition booted with PIM image")
 
     # No need to validate the AI application deployed via PIM flow if 'ai.validation.request' set to no, can complete the workflow
@@ -113,7 +72,7 @@ def monitor_bootstrap_boot(config):
                     raise Exception(f"failed to detect bootc based PIM AI image install completion signature. error: {out}")
         else:
             logger.debug(
-                "Could not find 'getcontainer.service', will look for 'base_config.service' in PIM boot since it could be a re-run and bootstrap might have already finished")
+                "Could not find 'getcontainer.service' in PIM boot since it could be a re-run and bootstrap might have already finished")
             ssh_client.close()
     except Exception as e:
         logger.error(f"failed to monitor bootstrap boot, error: {e}")