Added CFEngine ID in cf-remote info

Ticket: CFE-4518
Signed-off-by: Victor Moene <[email protected]>

Author: victormlg

cf_remote/nt-discovery.sh

@@ -26,6 +26,10 @@ run_command "uname -m" "ARCH"
 run_command "cat /etc/os-release" "OS_RELEASE"
 run_command "cat /etc/redhat-release" "REDHAT_RELEASE"
 
+# cf-key
+
+run_command "cf-key -p" "CF_HOST_KEY" "Couldn't run cf-key"
+
 # cf-agent
 
 cfagent_path=$(command -v cf-agent)

cf_remote/remote.py

@@ -100,6 +100,12 @@ def print_info(data):
             output["Policy server"] = policy_server
         else:
             output["Policy server"] = "None (not bootstrapped yet)"
+
+        cf_hostkey = data.get("cf_hostkey")
+        if cf_hostkey:
+            output["CFEngine ID"] = cf_hostkey
+        else:
+            output["CFEngine ID"] = "None (no key generated yet)"
     else:
         output["CFEngine"] = "Not installed"
 
@@ -248,6 +254,7 @@ def get_info(host, *, users=None, connection=None):
             data["redhat_release"] = redhat_release_data
 
         data["package_tags"] = get_package_tags(os_release_data, redhat_release_data)
+        data["cf_hostkey"] = discovery.get("NTD_CF_HOST_KEY")
         data["agent_location"] = discovery.get("NTD_CFAGENT_PATH")
         data["policy_server"] = discovery.get("NTD_POLICY_SERVER")
         agent = r"/var/cfengine/bin/cf-agent"