add cloud and payg checks

uyuni-project · Aug 16, 2023 · 5c72f8d · 5c72f8d
1 parent 7343181
commit 5c72f8d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/...ortutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.changes.mc.payg b/...ortutils-plugin-susemanager-client/supportutils-plugin-susemanager-client.changes.mc.payg
@@ -0,0 +1 @@
+- add cloud and payg checks
diff --git a/susemanager-utils/supportutils-plugin-susemanager-client/susemanagerclient b/susemanager-utils/supportutils-plugin-susemanager-client/susemanagerclient
@@ -148,3 +148,7 @@ if which podman >/dev/null 2>&1; then
         plugin_command "podman logs $CONTAINER"
     done
 fi
+
+section_header "Cloud / PAYG"
+plugin_command "test -e /usr/bin/instance-flavor-check && /usr/bin/instance-flavor-check"
+validate_rpm_if_installed "python-instance-billing-flavor-check"
diff --git a/...ger-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.mc.payg b/...ger-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.mc.payg
@@ -0,0 +1 @@
+- add cloud and payg checks
diff --git a/susemanager-utils/supportutils-plugin-susemanager/susemanager b/susemanager-utils/supportutils-plugin-susemanager/susemanager
@@ -84,8 +84,15 @@ plugin_command "echo \"select username scc_org from susecredentials sc join suse
 
 plugin_command "echo \"Number of elements in table susesaltevent. If the next number is too high, please verify the large scale tuning guide property 'java.salt_event_thread_pool_size'.\""
 plugin_command "echo \"select count(*) from susesaltevent;\" | spacewalk-sql --select-mode-direct -"
+plugin_command "grep \"Client bootstrap script\" /srv/www/htdocs/pub/bootstrap/*.sh"
+
+section_header "Cloud / PAYG"
+plugin_command "/usr/bin/instance-flavor-check"
+if [ -e /usr/bin/instance-flavor-check -a $(/usr/bin/instance-flavor-check) == "PAYG" ]; then
+        validate_rpm "python-instance-billing-flavor-check"
+        validate_rpm "billing-data-service"
+fi
 
 plugin_command "/sbin/supportconfig-sumalog $LOG"
 plugin_command "cp /var/log/zypper.log $LOG"
-plugin_command "grep \"Client bootstrap script\" /srv/www/htdocs/pub/bootstrap/*.sh"