Skip to content

Commit ecd591b

Browse files
committed
Added role in cf-remote info
Ticket: CFE-3919 Signed-off-by: Victor Moene <[email protected]>
1 parent be11144 commit ecd591b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cf_remote/nt-discovery.sh

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ fi
4141
run_command "command -v $cfagent_path" "CFAGENT_PATH" "Cannot find cf-agent"
4242
run_command "$cfagent_path --version" "CFAGENT_VERSION"
4343
run_command "cat /var/cfengine/policy_server.dat" "POLICY_SERVER"
44+
run_command "cf-hub --version" "CFHUB"
4445

4546
# packages
4647

cf_remote/remote.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ def print_info(data):
9191
if "arch" in data:
9292
output["Architecture"] = data["arch"]
9393

94-
agent_version = data["agent_version"]
95-
if agent_version:
96-
output["CFEngine"] = agent_version
94+
role = data["role"]
95+
if data["agent_version"]:
96+
version, edition = data["agent_version"].split()
97+
output["CFEngine"] = f"{version} ({edition.strip("()")} {role})"
9798

9899
policy_server = data.get("policy_server")
99100
if policy_server:
@@ -253,6 +254,7 @@ def get_info(host, *, users=None, connection=None):
253254
agent = r"/var/cfengine/bin/cf-agent"
254255
data["agent"] = agent
255256
data["agent_version"] = parse_version(discovery.get("NTD_CFAGENT_VERSION"))
257+
data["role"] = "hub" if discovery.get("NTD_CFHUB") else "client"
256258

257259
data["bin"] = {}
258260
for bin in ["dpkg", "rpm", "yum", "apt", "pkg", "zypper"]:

0 commit comments

Comments
 (0)