ceph: starting the device discovery only based on env var

The decision to start the device discovery daemonset is made
by an env var on the operator pod since in some scenarios
the discovery needs to be started immediately with the operator
instead of being delayed to start with the cluster.

Signed-off-by: travisn <tnielsen@redhat.com>
This commit is contained in:
travisn committed 2019-08-26 11:20:38 -06:00
1 parent 0bdc98f333
commit f3e9a5adac
1 file changed
-9
-9
View File
@@ -166,15 +166,6 @@ func (o *Operator) startSystemDaemons(externalCeph bool) error {
}
}
// The discover daemon is only needed for local clusters where OSDs will be created.
// External clusters do not create OSDs locally.
if !externalCeph {
rookDiscover := discover.New(o.context.Clientset)
if err := rookDiscover.Start(namespace, o.rookImage, o.securityAccount); err != nil {
return fmt.Errorf("Error starting device discovery daemonset: %v", err)
}
}
serverVersion, err := o.context.Clientset.Discovery().ServerVersion()
if err != nil {
return fmt.Errorf("error getting server version: %v", err)