feat: Add spec "satellite_enabled_features" back (#3517)

* feat: Add spec "satellite_enabled_features" back * It is needed by a new rule, so add it back Signed-off-by: Huanhuan Li <[email protected]> * Adjust the place of "satellite_enabled_features" Signed-off-by: Huanhuan Li <[email protected]> * Remove useless line since it depends on core collection Signed-off-by: Huanhuan Li <[email protected]> Signed-off-by: Huanhuan Li <[email protected]> (cherry picked from commit c3adb62)
RedHatInsights · Sep 15, 2022 · b792b52 · b792b52
1 parent 51461c2
commit b792b52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/insights/specs/__init__.py b/insights/specs/__init__.py
@@ -219,7 +219,6 @@ class Specs(SpecSet):
     grubby_default_kernel = RegistryPoint()
     hammer_ping = RegistryPoint()
     hammer_task_list = RegistryPoint()
-    satellite_enabled_features = RegistryPoint()
     haproxy_cfg = RegistryPoint()
     haproxy_cfg_scl = RegistryPoint()
     heat_api_log = RegistryPoint(filterable=True)
@@ -615,6 +614,7 @@ class Specs(SpecSet):
     satellite_core_taskreservedresource_count = RegistryPoint()
     satellite_custom_ca_chain = RegistryPoint()
     satellite_custom_hiera = RegistryPoint()
+    satellite_enabled_features = RegistryPoint()
     satellite_katello_empty_url_repositories = RegistryPoint()
     satellite_katello_repos_with_muliple_ref = RegistryPoint()
     satellite_mongodb_storage_engine = RegistryPoint()

diff --git a/insights/specs/default.py b/insights/specs/default.py
@@ -565,6 +565,7 @@ class DefaultSpecs(Specs):
         '/usr/bin/awk \'BEGIN { pipe="openssl x509 -noout -subject -enddate"} /^-+BEGIN CERT/,/^-+END CERT/ { print | pipe } /^-+END CERT/ { close(pipe); printf("\\n")}\' /etc/pki/katello/certs/katello-server-ca.crt',
     )
     satellite_custom_hiera = simple_file("/etc/foreman-installer/custom-hiera.yaml")
+    satellite_enabled_features = simple_command("/usr/bin/curl -sk https://localhost:9090/features --connect-timeout 5", deps=[IsSatellite])
     satellite_katello_repos_with_muliple_ref = simple_command(
         '/usr/bin/sudo -iu postgres /usr/bin/psql -d foreman -c "select repository_href, count(*) from katello_repository_references group by repository_href having count(*) > 1;" --csv',
         deps=[IsSatellite]