Browse Source

Require -hyperkube RPMs instead of -master

Vadim Rutkovsky 6 years ago
parent
commit
c1a47bc81d

+ 1 - 1
roles/openshift_health_checker/openshift_checks/package_availability.py

@@ -36,7 +36,7 @@ class PackageAvailability(NotContainerizedMixin, OpenShiftCheck):
         return [
             "{rpm_prefix}".format(rpm_prefix=rpm_prefix),
             "{rpm_prefix}-clients".format(rpm_prefix=rpm_prefix),
-            "{rpm_prefix}-master".format(rpm_prefix=rpm_prefix),
+            "{rpm_prefix}-hyperkube".format(rpm_prefix=rpm_prefix),
             "bash-completion",
             "cockpit-bridge",
             "cockpit-docker",

+ 4 - 4
roles/openshift_health_checker/test/package_availability_test.py

@@ -21,14 +21,14 @@ def test_is_active(pkg_mgr, openshift_is_atomic, is_active):
     (
         dict(openshift_service_type='origin'),
         set(),
-        set(['openshift-master', 'openshift-node']),
+        set(['openshift-hyperkube', 'openshift-node']),
     ),
     (
         dict(
             openshift_service_type='origin',
             group_names=['oo_masters_to_config'],
         ),
-        set(['origin-master']),
+        set(['origin-hyperkube']),
         set(['origin-node']),
     ),
     (
@@ -37,14 +37,14 @@ def test_is_active(pkg_mgr, openshift_is_atomic, is_active):
             group_names=['oo_nodes_to_config'],
         ),
         set(['atomic-openshift-node']),
-        set(['atomic-openshift-master']),
+        set(['atomic-openshift-hyperkube']),
     ),
     (
         dict(
             openshift_service_type='atomic-openshift',
             group_names=['oo_masters_to_config', 'oo_nodes_to_config'],
         ),
-        set(['atomic-openshift-master', 'atomic-openshift-node']),
+        set(['atomic-openshift-hyperkube', 'atomic-openshift-node']),
         set(),
     ),
 ])