fix(hatchery/openstack): register worker (#3355)

Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
ovh · Sep 25, 2018 · 3679c52 · 3679c52
1 parent 9c85855
commit 3679c52
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 8 deletions.
diff --git a/engine/api/services/dao.go b/engine/api/services/dao.go
@@ -70,7 +70,7 @@ func All(db gorp.SqlExecutor) ([]sdk.Service, error) {
 		if err == sdk.ErrNotFound {
 			return nil, nil
 		}
-		return nil, sdk.WrapError(err, "All> Unable to find dead services")
+		return nil, sdk.WrapError(err, "All> Unable to find all services")
 	}
 	return services, nil
 }

diff --git a/engine/hatchery/openstack/spawn.go b/engine/hatchery/openstack/spawn.go
@@ -75,7 +75,7 @@ func (h *HatcheryOpenstack) SpawnWorker(ctx context.Context, spawnArgs hatchery.
 	}
 
 	if spawnArgs.RegisterOnly {
-		spawnArgs.Model.ModelVirtualMachine.Cmd = strings.Replace(spawnArgs.Model.ModelVirtualMachine.Cmd, "worker ", "worker register ", 1)
+		spawnArgs.Model.ModelVirtualMachine.Cmd += " register"
 	}
 
 	udata := spawnArgs.Model.ModelVirtualMachine.PreCmd + "\n" + spawnArgs.Model.ModelVirtualMachine.Cmd + "\n" + spawnArgs.Model.ModelVirtualMachine.PostCmd

diff --git a/ui/src/app/views/admin/worker-model-pattern/add/worker-model-pattern.add.html b/ui/src/app/views/admin/worker-model-pattern/add/worker-model-pattern.add.html
@@ -43,7 +43,9 @@ <h2>{{'worker_model_pattern_add' | translate}}</h2>
               </textarea>
             </div>
             <div class="field">
-              <label>{{'worker_model_cmd' | translate}}</label>
+              <label suiPopup [popupText]="'worker_model_cmd_tooltip' | translate" popupPlacement="top left">
+                {{'worker_model_cmd' | translate}} <i _ngcontent-c5="" class="fa fa-question-circle"></i>
+              </label>
               <input class="ui input"
                 type="text" name="cmd" [(ngModel)]="pattern.model.cmd"
                 [disabled]="loading || !currentUser.admin">

diff --git a/ui/src/app/views/admin/worker-model-pattern/edit/worker-model-pattern.edit.html b/ui/src/app/views/admin/worker-model-pattern/edit/worker-model-pattern.edit.html
@@ -38,7 +38,9 @@ <h2>{{'worker_model_pattern_edit' | translate}}</h2>
               <textarea class="ui input" name="pre_cmd" [(ngModel)]="pattern.model.pre_cmd" [disabled]="loading || !currentUser.admin"></textarea>
             </div>
             <div class="field">
-              <label>{{'worker_model_cmd' | translate}}</label>
+              <label suiPopup [popupText]="'worker_model_cmd_tooltip' | translate" popupPlacement="top left">
+                {{'worker_model_cmd' | translate}} <i _ngcontent-c5="" class="fa fa-question-circle"></i>
+              </label>
               <input class="ui input" type="text" name="cmd" [(ngModel)]="pattern.model.cmd" [disabled]="loading || !currentUser.admin">
             </div>
             <div class="field" *ngIf="pattern.type && pattern.type === 'docker'">

diff --git a/ui/src/app/views/settings/worker-model/add/worker-model.add.html b/ui/src/app/views/settings/worker-model/add/worker-model.add.html
@@ -112,7 +112,9 @@ <h2 *ngIf="!workerModel || !workerModel.id">{{ 'worker_model_new_title' | transl
                 <input class="ui input" type="text" placeholder="sh -c" name="shell" [(ngModel)]="workerModel.model_docker.shell" [disabled]="loading || (!currentUser.admin && !workerModel.restricted)">
               </div>
               <div class="field">
-                <label>{{'worker_model_cmd_docker' | translate}} *</label>
+                <label suiPopup [popupText]="'worker_model_cmd_tooltip' | translate" popupPlacement="top left">
+                  {{'worker_model_cmd_docker' | translate}} * <i _ngcontent-c5="" class="fa fa-question-circle"></i>
+                </label>
                 <input class="ui input" type="text" name="cmd" [(ngModel)]="workerModel.model_docker.cmd" [disabled]="loading || (!currentUser.admin && !workerModel.restricted)">
               </div>
               <div class="field">
@@ -180,7 +182,9 @@ <h2 *ngIf="!workerModel || !workerModel.id">{{ 'worker_model_new_title' | transl
                 </textarea>
               </div>
               <div class="field">
-                <label>{{'worker_model_cmd' | translate}} *</label>
+                <label suiPopup [popupText]="'worker_model_cmd_tooltip' | translate" popupPlacement="top left">
+                    {{'worker_model_cmd' | translate}} * <i _ngcontent-c5="" class="fa fa-question-circle"></i>
+                </label>
                 <input
                   class="ui input"
                   type="text"

diff --git a/ui/src/app/views/settings/worker-model/edit/worker-model.edit.html b/ui/src/app/views/settings/worker-model/edit/worker-model.edit.html
@@ -150,7 +150,9 @@ <h2 *ngIf="workerModel && workerModel.id">{{ 'worker_model_edit_title' | transla
                 <input class="ui input" type="text" name="shell" placeholder="sh -c" [(ngModel)]="workerModel.model_docker.shell" [disabled]="loading || (!currentUser.admin && !workerModel.restricted)">
               </div>
               <div class="field">
-                <label>{{'worker_model_cmd_docker' | translate}} *</label>
+                <label suiPopup [popupText]="'worker_model_cmd_tooltip' | translate" popupPlacement="top left">
+                    {{'worker_model_cmd_docker' | translate}} * <i _ngcontent-c5="" class="fa fa-question-circle"></i>
+                </label>
                 <input
                   class="ui input"
                   type="text"
@@ -223,7 +225,9 @@ <h2 *ngIf="workerModel && workerModel.id">{{ 'worker_model_edit_title' | transla
                 </textarea>
               </div>
               <div class="field">
-                <label>{{'worker_model_cmd' | translate}} *</label>
+                <label suiPopup [popupText]="'worker_model_cmd_tooltip' | translate" popupPlacement="top left">
+                    {{'worker_model_cmd' | translate}} * <i _ngcontent-c5="" class="fa fa-question-circle"></i>
+                </label>
                 <input
                   class="ui input"
                     type="text"

diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
@@ -852,6 +852,7 @@
   "worker_model_cmd_docker": "Command",
   "worker_model_shell_docker": "Shell command",
   "worker_model_cmd": "Main worker command",
+  "worker_model_cmd_tooltip": "The command must end with ./worker",
   "worker_model_post_cmd": "Post worker command",
   "worker_model_shell_cmd": "Main shell command",
 

diff --git a/ui/src/assets/i18n/fr.json b/ui/src/assets/i18n/fr.json
@@ -850,6 +850,7 @@
   "worker_model_pattern_edit": "Editer un pattern de modèle de worker",
   "worker_model_pre_cmd": "Commande avant exécution du worker",
   "worker_model_cmd": "Commande principale du worker",
+  "worker_model_cmd_tooltip": "La commande doit terminer par ./worker",
   "worker_model_cmd_docker": "Commande",
   "worker_model_shell_docker": "Commande shell",
   "worker_model_post_cmd": "Commande après exécution du worker",