Merge pull request openshift#495 from cgwalters/no-rpm-ostree-on-classic

daemon: Only print status if os == RHCOS
umohnani8 · Feb 26, 2019 · 9133b43 · 9133b43
2 parents 875f25e + 023f810
commit 9133b43
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/cmd/machine-config-daemon/start.go b/cmd/machine-config-daemon/start.go
@@ -154,12 +154,6 @@ func runStartCmd(cmd *cobra.Command, args []string) {
 	}
 
 	if startOpts.onceFrom == "" {
-		status, err := dn.NodeUpdaterClient.GetStatus()
-		if err != nil {
-			glog.Fatalf("unable to get rpm-ostree status: %s", err)
-		}
-		glog.Info(status)
-
 		err = dn.CheckStateOnBoot()
 		if err != nil {
 			dn.EnterDegradedState(errors.Wrapf(err, "Checking initial state"))

diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -560,6 +560,15 @@ func (dn *Daemon) getPendingConfig() (string, error) {
 //
 // Some more background in this PR: https://github.com/openshift/machine-config-operator/pull/245
 func (dn *Daemon) CheckStateOnBoot() error {
+	// Print status if available
+	if dn.OperatingSystem == machineConfigDaemonOSRHCOS {
+		status, err := dn.NodeUpdaterClient.GetStatus()
+		if err != nil {
+			glog.Fatalf("unable to get rpm-ostree status: %s", err)
+		}
+		glog.Info(status)
+	}
+
 	pendingConfigName, err := dn.getPendingConfig()
 	if err != nil {
 		return err