Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cf_remote/nt-discovery.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ run_command "uname -m" "ARCH"
run_command "cat /etc/os-release" "OS_RELEASE"
run_command "cat /etc/redhat-release" "REDHAT_RELEASE"

# cf-key

cfkey_path=$(cf_path "cf-key")
run_command "$cfkey_path -p" "CFENGINE_ID" "Couldn't run cf-key"

# cf-agent

cfagent_path=$(cf_path "cf-agent")
Expand Down
7 changes: 7 additions & 0 deletions cf_remote/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ def print_info(data):
output["Policy server"] = policy_server
else:
output["Policy server"] = "None (not bootstrapped yet)"

cfengine_id = data.get("cfengine_id")
if cfengine_id:
output["CFEngine ID"] = cfengine_id
else:
output["CFEngine ID"] = "None (no key generated yet)"
else:
output["CFEngine"] = "Not installed"

Expand Down Expand Up @@ -249,6 +255,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["cfengine_id"] = discovery.get("NTD_CFENGINE_ID")
data["agent_location"] = discovery.get("NTD_CFAGENT_PATH")
data["policy_server"] = discovery.get("NTD_POLICY_SERVER")
agent = r"/var/cfengine/bin/cf-agent"
Expand Down