Merge pull request #673 from jichenjc/move_log

Move log to creating place

Author: k8s-ci-robot

controllers/openstackmachine_controller.go

@@ -287,8 +287,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-
-	logger.Info("Creating Machine")
+	logger.Info("Reconciling Machine create started")
 
 	clusterName := fmt.Sprintf("%s-%s", cluster.ObjectMeta.Namespace, cluster.Name)
 
@@ -307,7 +306,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
 		return ctrl.Result{}, err
 	}
 
-	instance, err := r.getOrCreate(computeService, machine, openStackMachine, cluster, openStackCluster, userData)
+	instance, err := r.getOrCreate(computeService, machine, openStackMachine, cluster, openStackCluster, userData, logger)
 	if err != nil {
 		handleUpdateMachineError(logger, openStackMachine, errors.Errorf("OpenStack instance cannot be created: %v", err))
 		return ctrl.Result{}, err
@@ -371,14 +370,15 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
 	return ctrl.Result{}, nil
 }
 
-func (r *OpenStackMachineReconciler) getOrCreate(computeService *compute.Service, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, userData string) (*infrav1.Instance, error) {
+func (r *OpenStackMachineReconciler) getOrCreate(computeService *compute.Service, machine *clusterv1.Machine, openStackMachine *infrav1.OpenStackMachine, cluster *clusterv1.Cluster, openStackCluster *infrav1.OpenStackCluster, userData string, logger logr.Logger) (*infrav1.Instance, error) {
 
 	instance, err := computeService.InstanceExists(openStackMachine.Name)
 	if err != nil {
 		return nil, err
 	}
 
 	if instance == nil {
+		logger.Info("Machine not exist, Creating Machine", "Machine", openStackMachine.Name)
 		instance, err = computeService.InstanceCreate(cluster.Name, machine, openStackMachine, openStackCluster, userData)
 		if err != nil {
 			return nil, errors.Errorf("error creating Openstack instance: %v", err)