deploy messaging by default

nasark · Jan 4, 2024 · 3ce2e06 · 3ce2e06
1 parent 09da4c7
commit 3ce2e06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/images/manageiq-orchestrator/container-assets/entrypoint b/images/manageiq-orchestrator/container-assets/entrypoint
@@ -116,10 +116,7 @@ EOS
 
 check_svc_status ${MEMCACHED_SERVICE_HOST} ${MEMCACHED_SERVICE_PORT}
 check_svc_status ${database_hostname} ${database_port}
-
-if [ -n "$MESSAGING_HOSTNAME" ] && [ -n "$MESSAGING_PORT" ]; then
-  check_svc_status ${MESSAGING_HOSTNAME} ${MESSAGING_PORT}
-fi
+check_svc_status ${MESSAGING_HOSTNAME} ${MESSAGING_PORT}
 
 check_deployment_status || exit 1
 

diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
@@ -50,11 +50,7 @@ func databaseVolumeCapacity(cr *miqv1alpha1.ManageIQ) string {
 }
 
 func deployMessagingService(cr *miqv1alpha1.ManageIQ) bool {
-	if cr.Spec.DeployMessagingService == nil {
-		return true
-	} else {
-		return *cr.Spec.DeployMessagingService
-	}
+	return true
 }
 
 func enableApplicationLocalLogin(cr *miqv1alpha1.ManageIQ) bool {