Browse Source

Correction des messages CreoleLint

- Retour de la filelist dans la condition disable_if_in
- Suppression d'un template qui n'existe plus
- Mise à jour du template user.yaml pour être compatible avec la version
  5.0.2

ref #16991 @1h
tags/pkg/dev/eole-2.7.0/0.0.1-0
Philippe Caseiro 2 years ago
parent
commit
2822dd5727
3 changed files with 558 additions and 270 deletions
  1. 9
    8
      dicos/99_one-frontend.xml
  2. 549
    241
      tmpl/user.yaml
  3. 0
    21
      tmpl/vdcadmin.yaml

+ 9
- 8
dicos/99_one-frontend.xml View File

@@ -2,13 +2,14 @@
2 2
 <creole>
3 3
     <files>
4 4
         <service>opennebula-sunstone</service>
5
-        <file filelist='onefrontend' name='/etc/one/sunstone-server.conf' rm='True' mkdir='True'/>
6
-		<file filelist='onefrontend' name='/etc/one/sunstone-views/admin.yaml' rm='True' mkdir='True'/>
7
-		<file filelist='onefrontend' name='/etc/one/sunstone-views/admin_vcenter.yaml' rm='True' mkdir='True'/>
8
-		<file filelist='onefrontend' name='/etc/one/sunstone-views/groupadmin.yaml' rm='True' mkdir='True'/>
9
-		<file filelist='onefrontend' name='/etc/one/sunstone-views/groupadmin_vcenter.yaml' rm='True' mkdir='True'/>
10
-        <file filelist='onefrontend' name='/etc/one/auth/ldap_auth.conf' source='sunstone-ldap_auth.conf' rm='True' mkdir='True'/>
11
-        <file filelist='onefrontend' name='/etc/nginx/sites-available/nebula.conf' source='nginx-nebula.conf' rm='True' mkdir='True'/>
5
+        <file filelist='onefrontend' name='/etc/one/sunstone-server.conf'/>
6
+		<file filelist='onefrontend' name='/etc/one/sunstone-views/admin.yaml'/>
7
+		<file filelist='onefrontend' name='/etc/one/sunstone-views/cloud.yaml'/>
8
+		<file filelist='onefrontend' name='/etc/one/sunstone-views/admin_vcenter.yaml'/>
9
+		<file filelist='onefrontend' name='/etc/one/sunstone-views/groupadmin.yaml'/>
10
+		<file filelist='onefrontend' name='/etc/one/sunstone-views/groupadmin_vcenter.yaml'/>
11
+        <file filelist='onefrontend' name='/etc/one/auth/ldap_auth.conf' source='sunstone-ldap_auth.conf'/>
12
+        <file filelist='onefrontend' name='/etc/nginx/sites-available/nebula.conf' source='nginx-nebula.conf'/>
12 13
         <file filelist='appmarket' name='/etc/one/sunstone-appmarket.conf' rm='True' mkdir='True'/>
13 14
         <service_access service='sunstoneHttps'>
14 15
             <port>443</port>
@@ -94,7 +95,7 @@
94 95
 
95 96
         <condition name='disabled_if_in' source='activer_onefrontend'>
96 97
             <param>non</param>
97
-            <!--target type='filelist'>onefrontend</target-->
98
+            <target type='filelist'>onefrontend</target>
98 99
             <target type='variable'>port_sunstone</target>
99 100
             <target type='variable'>vnc_proxy_port_sunstone</target>
100 101
             <target type='variable'>xmlrpc_port_sunstone</target>

+ 549
- 241
tmpl/user.yaml View File

@@ -1,91 +1,123 @@
1
-small_logo: images/opennebula-sunstone-v4.0-small.png
2
-provision_logo: images/one_small_logo.png
1
+%set oneflow = %%getVar('activer_oneflow','non') == 'oui'
2
+small_logo: images/opennebula-5.0.png
3
+provision_logo: images/opennebula-5.0.png
3 4
 enabled_tabs:
4
-    dashboard-tab: true
5
-    system-tab: false
6
-    users-tab: false
7
-    groups-tab: false
8
-    acls-tab: false
9
-    vresources-tab: true
10
-    vms-tab: true
11
-    templates-tab: true
12
-    images-tab: true
13
-    files-tab: true
14
-    infra-tab: true
15
-    clusters-tab: false
16
-    hosts-tab: false
17
-    datastores-tab: true
18
-    vnets-tab: true
19
-%if %%getVar('activer_market_place', 'non')
20
-    marketplace-tab: true
5
+    - dashboard-tab
6
+    - instances-top-tab
7
+    - vms-tab
8
+%if %%oneflow
9
+    - oneflow-services-tab
21 10
 %end if
22
-%if %%getVar('activer_oneflow', 'non') == 'oui'
23
-    oneflow-dashboard: true
24
-    oneflow-services: true
25
-    oneflow-templates: true
26
-%else
27
-    oneflow-dashboard: false
28
-    oneflow-services: false
29
-    oneflow-templates: false
11
+    - vrouters-tab
12
+    - templates-top-tab
13
+    - templates-tab
14
+%if %%oneflow
15
+    - oneflow-templates-tab
30 16
 %end if
31
-%if %%getVar('activer_market_views', 'non') == 'oui'
32
-    apptools-appmarket-dashboard: true
33
-    apptools-appmarket-appliances: true
34
-%end if
35
-    support-tab: false
36
-    doc-tab: false
37
-    community-tab: false
38
-    enterprise-tab: false
17
+    - vrouter-templates-tab
18
+    - storage-top-tab
19
+    - datastores-tab
20
+    - images-tab
21
+    - files-tab
22
+    - marketplaces-tab
23
+    - marketplaceapps-tab
24
+    - network-top-tab
25
+    - vnets-tab
26
+    - vnets-topology-tab
27
+    - secgroups-tab
28
+    #- infrastructure-top-tab
29
+    #- clusters-tab
30
+    #- hosts-tab
31
+    #- zones-tab
32
+    #- system-top-tab
33
+    #- users-tab
34
+    #- groups-tab
35
+    #- vdcs-tab
36
+    #- acls-tab
37
+    - settings-tab
38
+    #- support-tab
39
+    #- upgrade-top-tab
39 40
 autorefresh: true
41
+features:
42
+    # True to show showback monthly reports, and VM cost
43
+    showback: true
44
+
45
+    # Allows to change the security groups for each network interface
46
+    # on the VM creation dialog
47
+    secgroups: true
48
+
49
+    # True to hide the CPU setting in the VM creation dialog. The CPU setting
50
+    # will be set to the same value as VCPU, that will still be visible for the
51
+    # end users
52
+    instantiate_hide_cpu: false
40 53
 tabs:
41 54
     dashboard-tab:
55
+        # The following widgets can be used inside any of the '_per_row' settings
56
+        # bellow. As the name suggest, the widgets will be scaled to fit one,
57
+        # two, or three per row. The footer uses the widgets at full size, i.e.
58
+        # one per row.
59
+        #
60
+        # - storage
61
+        # - users
62
+        # - network
63
+        # - hosts
64
+        # - vms
65
+        # - groupquotas
66
+        # - quotas
42 67
         panel_tabs:
43 68
         actions:
44 69
             Dashboard.refresh: false
45 70
             Sunstone.toggle_top: false
71
+        widgets_one_per_row:
72
+            - vms
46 73
         widgets_three_per_row:
47
-            #- users
48 74
         widgets_two_per_row:
49 75
             - network
50 76
             - storage
51
-            - user_quotas
52
-            - group_quotas
53
-            #- hosts
54
-            #- vms
55
-        widgets_one_per_row:
56
-            - vms
57 77
         widgets_one_footer:
58
-            - accounting
59
-    system-tab:
78
+    system-top-tab:
60 79
         panel_tabs:
61 80
         actions:
62 81
     users-tab:
63 82
         panel_tabs:
64 83
             user_info_tab: true
65 84
             user_quotas_tab: true
85
+            user_groups_tab: true
86
+            user_accounting_tab: true
87
+            user_showback_tab: true
66 88
         table_columns:
67 89
             - 0         # Checkbox
68 90
             - 1         # ID
69 91
             - 2         # Name
70 92
             - 3         # Group
71 93
             - 4         # Auth driver
72
-            - 5         # VMs
73
-            - 6         # Memory
74
-            - 7         # CPU
75
-            #- 8         # Group ID
94
+            #- 5         # Password
95
+            - 6         # VMs
96
+            - 7         # Memory
97
+            - 8         # CPU
98
+            #- 9         # Group ID
99
+            #- 10        # Hidden User Data
100
+            #- 11        # Labels
101
+            #- 12        # Search data
76 102
         actions:
77 103
             User.refresh: true
78 104
             User.create_dialog: true
79 105
             User.update_password: true
106
+            User.login_token: true
80 107
             User.quotas_dialog: true
108
+            User.groups_dialog: true
81 109
             User.chgrp: true
82
-            User.addgroup: true
83
-            User.delgroup: true
84
-            User.chauth: true
110
+            User.change_authentication: true
85 111
             User.delete: true
112
+            User.edit_labels: true
113
+            User.menu_labels: true
86 114
     groups-tab:
87 115
         panel_tabs:
116
+            group_info_tab: true
117
+            group_users_tab: true
88 118
             group_quotas_tab: true
119
+            group_accounting_tab: true
120
+            group_showback_tab: true
89 121
         table_columns:
90 122
             - 0         # Checkbox
91 123
             - 1         # ID
@@ -94,11 +126,39 @@ tabs:
94 126
             - 4         # VMs
95 127
             - 5         # Memory
96 128
             - 6         # CPU
129
+            #- 7         # Labels
97 130
         actions:
98 131
             Group.refresh: true
99 132
             Group.create_dialog: true
133
+            Group.update_dialog: true
100 134
             Group.quotas_dialog: true
101 135
             Group.delete: true
136
+            Group.edit_admins: true
137
+            Group.edit_labels: true
138
+            Group.menu_labels: true
139
+    vdcs-tab:
140
+        panel_tabs:
141
+            vdc_info_tab: true
142
+            vdc_groups_tab: true
143
+            vdc_resources_tab: true
144
+        table_columns:
145
+            - 0         # Checkbox
146
+            - 1         # ID
147
+            - 2         # Name
148
+            - 3         # Groups
149
+            - 4         # Clusters
150
+            - 5         # Hosts
151
+            - 6         # VNets
152
+            - 7         # Datastores
153
+            #- 8         # Labels
154
+        actions:
155
+            Vdc.refresh: true
156
+            Vdc.create_dialog: true
157
+            Vdc.update_dialog: true
158
+            Vdc.rename: true
159
+            Vdc.delete: true
160
+            Vdc.edit_labels: true
161
+            Vdc.menu_labels: true
102 162
     acls-tab:
103 163
         panel_tabs:
104 164
         table_columns:
@@ -114,18 +174,129 @@ tabs:
114 174
             Acl.refresh: true
115 175
             Acl.create_dialog: true
116 176
             Acl.delete: true
117
-    vresources-tab:
177
+    templates-top-tab:
178
+        panel_tabs:
179
+        actions:
180
+    templates-tab:
181
+        panel_tabs:
182
+            template_info_tab: true
183
+            template_template_tab: true
184
+        table_columns:
185
+            - 0         # Checkbox
186
+            - 1         # ID
187
+            - 2         # Owner
188
+            - 3         # Group
189
+            - 4         # Name
190
+            - 5         # Registration time
191
+            #- 6         # Labels
192
+            #- 7         # Search data
193
+        actions:
194
+            Template.refresh: true
195
+            Template.create_dialog: true
196
+            Template.import_dialog: false
197
+            Template.update_dialog: true
198
+            Template.instantiate_vms: true
199
+            Template.rename: true
200
+            Template.chown: false
201
+            Template.chgrp: false
202
+            Template.chmod: true
203
+            Template.clone_dialog: true
204
+            Template.delete_dialog: true
205
+            Template.share: true
206
+            Template.unshare: true
207
+            Template.edit_labels: true
208
+            Template.menu_labels: true
209
+        template_creation_tabs:
210
+            general: true
211
+            storage: true
212
+            network: true
213
+            os_booting: true
214
+            features: true
215
+            input_output: true
216
+            context: true
217
+            scheduling: false
218
+            hybrid: true
219
+            other: true
220
+%if %%oneflow
221
+    oneflow-templates-tab:
222
+        panel_tabs:
223
+            service_template_info_tab: true
224
+            service_template_roles_tab: true
225
+            service_template_template_tab: true
226
+        table_columns:
227
+            - 0         # Checkbox
228
+            - 1         # ID
229
+            - 2         # Owner
230
+            - 3         # Group
231
+            - 4         # Name
232
+            #- 5        # Labels
233
+            #- 6        # Search data
234
+        actions:
235
+            ServiceTemplate.refresh: true
236
+            ServiceTemplate.create_dialog: true
237
+            ServiceTemplate.update_dialog: true
238
+            ServiceTemplate.instantiate: true
239
+            ServiceTemplate.chown: false
240
+            ServiceTemplate.chgrp: false
241
+            ServiceTemplate.chmod: true
242
+            ServiceTemplate.rename: true
243
+            ServiceTemplate.clone_dialog: true
244
+            ServiceTemplate.delete: true
245
+            ServiceTemplate.edit_labels: true
246
+            ServiceTemplate.menu_labels: true
247
+%end if
248
+    vrouter-templates-tab:
249
+        panel_tabs:
250
+            vrouter_template_info_tab: true
251
+            vrouter_template_template_tab: true
252
+        table_columns:
253
+            - 0         # Checkbox
254
+            - 1         # ID
255
+            - 2         # Owner
256
+            - 3         # Group
257
+            - 4         # Name
258
+            - 5         # Registration time
259
+            #- 6         # Labels
260
+            #- 7         # Search data
261
+        actions:
262
+            VirtualRouterTemplate.refresh: true
263
+            VirtualRouterTemplate.create_dialog: true
264
+            VirtualRouterTemplate.update_dialog: true
265
+            VirtualRouterTemplate.instantiate_dialog: true
266
+            VirtualRouterTemplate.rename: true
267
+            VirtualRouterTemplate.chown: false
268
+            VirtualRouterTemplate.chgrp: false
269
+            VirtualRouterTemplate.chmod: true
270
+            VirtualRouterTemplate.clone_dialog: true
271
+            VirtualRouterTemplate.delete_dialog: true
272
+            VirtualRouterTemplate.share: true
273
+            VirtualRouterTemplate.unshare: true
274
+            VirtualRouterTemplate.edit_labels: true
275
+            VirtualRouterTemplate.menu_labels: true
276
+        template_creation_tabs:
277
+            general: true
278
+            storage: true
279
+            network: true
280
+            os_booting: true
281
+            features: true
282
+            input_output: true
283
+            context: true
284
+            scheduling: true
285
+            hybrid: true
286
+            other: true
287
+    instances-top-tab:
118 288
         panel_tabs:
119 289
         actions:
120 290
     vms-tab:
121 291
         panel_tabs:
122 292
             vm_info_tab: true
123 293
             vm_capacity_tab: true
124
-            vm_hotplugging_tab: true
294
+            vm_storage_tab: true
125 295
             vm_network_tab: true
126 296
             vm_snapshot_tab: true
127 297
             vm_placement_tab: false
128 298
             vm_actions_tab: true
299
+            vm_conf_tab: true
129 300
             vm_template_tab: false
130 301
             vm_log_tab: false
131 302
         table_columns:
@@ -141,9 +312,13 @@ tabs:
141 312
             - 9       # IPs
142 313
             #- 10      # Start Time
143 314
             - 11      # VNC
315
+            #- 12      # Hidden Template
316
+            #- 13      # Labels
317
+            #- 14      # Search data
144 318
         actions:
145 319
             VM.refresh: true
146 320
             VM.create_dialog: true
321
+            VM.rename: true
147 322
             VM.chown: false
148 323
             VM.chgrp: false
149 324
             VM.chmod: true
@@ -156,115 +331,117 @@ tabs:
156 331
             VM.resume: true
157 332
             VM.stop: true
158 333
             VM.recover: false
159
-            VM.boot: true
160 334
             VM.reboot: true
161 335
             VM.reboot_hard: true
162 336
             VM.poweroff: true
163 337
             VM.poweroff_hard: true
164 338
             VM.undeploy: true
165 339
             VM.undeploy_hard: true
166
-            VM.shutdown: true
167
-            VM.shutdown_hard: true
168
-            VM.delete: true
169
-            VM.delete_recreate: true
340
+            VM.terminate: true
341
+            VM.terminate_hard: true
170 342
             VM.resize: true
171 343
             VM.attachdisk: true
172 344
             VM.detachdisk: true
173
-            VM.saveas: true
345
+            VM.disk_saveas: true
174 346
             VM.attachnic: true
175 347
             VM.detachnic: true
176 348
             VM.snapshot_create: true
177 349
             VM.snapshot_revert: true
178 350
             VM.snapshot_delete: true
351
+            VM.disk_snapshot_create: true
352
+            VM.disk_snapshot_revert: true
353
+            VM.disk_snapshot_delete: true
179 354
             VM.resched: false
180 355
             VM.unresched: false
181
-    templates-tab:
356
+            VM.save_as_template: true
357
+            VM.updateconf: true
358
+            VM.edit_labels: true
359
+            VM.menu_labels: true
360
+%if %%oneflow
361
+    oneflow-services-tab:
182 362
         panel_tabs:
183
-            template_info_tab: true
184
-            template_template_tab: true
185
-        table_columns:
186
-            - 0         # Checkbox
187
-            - 1         # ID
188
-            - 2         # Owner
189
-            - 3         # Group
190
-            - 4         # Name
191
-            - 5         # Registration time
192
-        actions:
193
-            Template.refresh: true
194
-            Template.create_dialog: true
195
-            Template.update_dialog: true
196
-            Template.instantiate_vms: true
197
-            Template.chown: false
198
-            Template.chgrp: false
199
-            Template.chmod: true
200
-            Template.clone_dialog: true
201
-            Template.delete: true
202
-        template_creation_tabs:
203
-            general: true
204
-            storage: true
205
-            network: true
206
-            os_booting: true
207
-            features: true
208
-            input_output: true
209
-            context: true
210
-            scheduling: false
211
-    images-tab:
212
-        panel_tabs:
213
-            image_info_tab: true
214
-            image_vms_tab: true
363
+            service_info_tab: true
364
+            service_roles_tab: true
365
+            service_log_tab: true
366
+        panel_tabs_actions:
367
+            service_roles_tab:
368
+                Role.scale: true
369
+                Role.hold: true
370
+                Role.release: true
371
+                Role.suspend: true
372
+                Role.resume: true
373
+                Role.stop: true
374
+                Role.reboot: true
375
+                Role.reboot_hard: true
376
+                Role.poweroff: true
377
+                Role.poweroff_hard: true
378
+                Role.undeploy: true
379
+                Role.undeploy_hard: true
380
+                Role.terminate: true
381
+                Role.terminate_hard: true
382
+                RoleVM.hold: true
383
+                RoleVM.release: true
384
+                RoleVM.suspend: true
385
+                RoleVM.resume: true
386
+                RoleVM.stop: true
387
+                RoleVM.reboot: true
388
+                RoleVM.reboot_hard: true
389
+                RoleVM.poweroff: true
390
+                RoleVM.poweroff_hard: true
391
+                RoleVM.undeploy: true
392
+                RoleVM.undeploy_hard: true
393
+                RoleVM.terminate: true
394
+                RoleVM.terminate_hard: true
395
+                RoleVM.resched: false
396
+                RoleVM.unresched: false
397
+                RoleVM.recover: false
215 398
         table_columns:
216 399
             - 0         # Checkbox
217 400
             - 1         # ID
218 401
             - 2         # Owner
219 402
             - 3         # Group
220 403
             - 4         # Name
221
-            - 5         # Datastore
222
-            #- 6         # Size
223
-            - 7        # Type
224
-            #- 8         # Registration time
225
-            #- 9        # Persistent
226
-            - 10        # Status
227
-            - 11        # #VMs
228
-            #- 12       # Target
404
+            - 5         # State
405
+            #- 6        # Labels
406
+            #- 7        # Search data
229 407
         actions:
230
-            Image.refresh: true
231
-            Image.create_dialog: true
232
-            Image.chown: false
233
-            Image.chgrp: false
234
-            Image.chmod: true
235
-            Image.enable: true
236
-            Image.disable: true
237
-            Image.persistent: true
238
-            Image.nonpersistent: true
239
-            Image.clone_dialog: true
240
-            Image.delete: true
241
-    files-tab:
408
+            Service.refresh: true
409
+            Service.create_dialog: true
410
+            Service.chown: false
411
+            Service.chgrp: false
412
+            Service.chmod: true
413
+            Service.rename: true
414
+            Service.shutdown: true
415
+            Service.recover: true
416
+            Service.delete: true
417
+            Service.edit_labels: true
418
+            Service.menu_labels: true
419
+%end if
420
+    vrouters-tab:
242 421
         panel_tabs:
243
-            file_info_tab: true
422
+            virtual_router_info_tab: true
423
+            virtual_router_vms_tab: true
244 424
         table_columns:
245 425
             - 0         # Checkbox
246 426
             - 1         # ID
247 427
             - 2         # Owner
248 428
             - 3         # Group
249 429
             - 4         # Name
250
-            - 5         # Datastore
251
-            #- 6         # Size
252
-            - 7        # Type
253
-            #- 8         # Registration time
254
-            #- 9        # Persistent
255
-            - 10        # Status
256
-            #- 11        # #VMs
257
-            #- 12       # Target
430
+            #- 5        # Labels
431
+            #- 6        # Search data
258 432
         actions:
259
-            File.refresh: true
260
-            File.create_dialog: true
261
-            File.chown: false
262
-            File.chgrp: false
263
-            File.chmod: true
264
-            File.enable: true
265
-            File.disable: true
266
-            File.delete: true
267
-    infra-tab:
433
+            VirtualRouter.refresh: true
434
+            VirtualRouter.create_dialog: true
435
+            VirtualRouter.rename: true
436
+            VirtualRouter.chown: true
437
+            VirtualRouter.chgrp: true
438
+            VirtualRouter.chmod: true
439
+            VirtualRouter.delete: true
440
+            VirtualRouter.attachnic: true
441
+            VirtualRouter.detachnic: true
442
+            VirtualRouter.edit_labels: true
443
+            VirtualRouter.menu_labels: true
444
+    infrastructure-top-tab:
268 445
         panel_tabs:
269 446
         actions:
270 447
     clusters-tab:
@@ -280,15 +457,24 @@ tabs:
280 457
             - 3         # Hosts
281 458
             - 4         # VNets
282 459
             - 5         # Datastores
460
+            #- 6         # Labels
283 461
         actions:
284 462
             Cluster.refresh: true
285 463
             Cluster.create_dialog: true
286 464
             Cluster.update_dialog: true
287 465
             Cluster.delete: true
466
+            Cluster.rename: true
467
+            Cluster.edit_labels: true
468
+            Cluster.menu_labels: true
288 469
     hosts-tab:
289 470
         panel_tabs:
290 471
             host_info_tab: true
291 472
             host_monitoring_tab: true
473
+            host_vms_tab: true
474
+            host_wilds_tab: true
475
+            host_zombies_tab: true
476
+            host_esx_tab: true
477
+            host_pci_tab: true
292 478
         table_columns:
293 479
             - 0         # Checkbox
294 480
             - 1         # ID
@@ -303,17 +489,43 @@ tabs:
303 489
             #- 10        # IM MAD
304 490
             #- 11        # VM MAD
305 491
             #- 12        # Last monitored on
492
+            #- 13        # Labels
493
+            #- 14        # Search data
306 494
         actions:
307 495
             Host.refresh: true
308 496
             Host.create_dialog: true
309 497
             Host.addtocluster: true
498
+            Host.rename: true
310 499
             Host.enable: true
311 500
             Host.disable: true
501
+            Host.offline: true
312 502
             Host.delete: true
503
+            Host.edit_labels: true
504
+            Host.menu_labels: true
505
+    zones-tab:
506
+        panel_tabs:
507
+            zone_info_tab: true
508
+        table_columns:
509
+            - 0         # Checkbox
510
+            - 1         # ID
511
+            - 2         # Name
512
+            - 3         # Endpoint
513
+            #- 4         # Labels
514
+        actions:
515
+            Zone.refresh: true
516
+            Zone.create_dialog: true
517
+            Zone.rename: true
518
+            Zone.delete: true
519
+            Zone.edit_labels: true
520
+            Zone.menu_labels: true
521
+    storage-top-tab:
522
+        panel_tabs:
523
+        actions:
313 524
     datastores-tab:
314 525
         panel_tabs:
315 526
             datastore_info_tab: false
316 527
             datastore_image_tab: true
528
+            datastore_clusters_tab: false
317 529
         table_columns:
318 530
             - 0         # Checkbox
319 531
             - 1         # ID
@@ -326,20 +538,166 @@ tabs:
326 538
             #- 8         # TM
327 539
             #- 9         # DS
328 540
             #- 10        # Type
329
-
541
+            #- 11        # Status
542
+            #- 12        # Labels
543
+            #- 13        # Search data
330 544
         actions:
331 545
             Datastore.refresh: true
332 546
             Datastore.create_dialog: false
547
+            Datastore.import_dialog: false
333 548
             Datastore.addtocluster: false
549
+            Datastore.rename: true
334 550
             Datastore.chown: false
335 551
             Datastore.chgrp: false
336 552
             Datastore.chmod: true
337 553
             Datastore.delete: false
554
+            Datastore.enable: false
555
+            Datastore.disable: false
556
+            Datastore.edit_labels: true
557
+            Datastore.menu_labels: true
558
+    images-tab:
559
+        panel_tabs:
560
+            image_info_tab: true
561
+            image_vms_tab: true
562
+            image_snapshots_tab: true
563
+        table_columns:
564
+            - 0         # Checkbox
565
+            - 1         # ID
566
+            - 2         # Owner
567
+            - 3         # Group
568
+            - 4         # Name
569
+            - 5         # Datastore
570
+            #- 6         # Size
571
+            - 7        # Type
572
+            #- 8         # Registration time
573
+            #- 9        # Persistent
574
+            - 10        # Status
575
+            - 11        # #VMs
576
+            #- 12       # Target
577
+            #- 13       # Labels
578
+            #- 14        # Search data
579
+        actions:
580
+            Image.refresh: true
581
+            Image.create_dialog: true
582
+            Image.import_dialog: false
583
+            Image.upload_marketplace_dialog: true
584
+            Image.rename: true
585
+            Image.chown: false
586
+            Image.chgrp: false
587
+            Image.chmod: true
588
+            Image.enable: true
589
+            Image.disable: true
590
+            Image.persistent: true
591
+            Image.nonpersistent: true
592
+            Image.clone_dialog: true
593
+            Image.delete: true
594
+            Image.snapshot_flatten: true
595
+            Image.snapshot_revert: true
596
+            Image.snapshot_delete: true
597
+            Image.edit_labels: true
598
+            Image.menu_labels: true
599
+    files-tab:
600
+        panel_tabs:
601
+            file_info_tab: true
602
+        table_columns:
603
+            - 0         # Checkbox
604
+            - 1         # ID
605
+            - 2         # Owner
606
+            - 3         # Group
607
+            - 4         # Name
608
+            - 5         # Datastore
609
+            #- 6         # Size
610
+            - 7        # Type
611
+            #- 8         # Registration time
612
+            #- 9        # Persistent
613
+            - 10        # Status
614
+            #- 11        # #VMs
615
+            #- 12       # Target
616
+            #- 13       # Labels
617
+            #- 14        # Search data
618
+        actions:
619
+            File.refresh: true
620
+            File.create_dialog: true
621
+            File.rename: true
622
+            File.chown: false
623
+            File.chgrp: false
624
+            File.chmod: true
625
+            File.enable: true
626
+            File.disable: true
627
+            File.delete: true
628
+            File.edit_labels: true
629
+            File.menu_labels: true
630
+    marketplaces-tab:
631
+        panel_tabs:
632
+            marketplace_info_tab: true
633
+            marketplace_apps_tab: true
634
+        table_columns:
635
+            - 0         # Checkbox
636
+            - 1         # ID
637
+            - 2         # Owner
638
+            - 3         # Group
639
+            - 4         # Name
640
+            - 5         # Capacity
641
+            - 6         # Apps
642
+            - 7         # Driver
643
+            - 8         # Zone
644
+            #- 9        # Labels
645
+            #- 10        # Search data
646
+        actions:
647
+            MarketPlace.refresh: true
648
+            MarketPlace.create_dialog: true
649
+            MarketPlace.update_dialog: true
650
+            MarketPlace.rename: true
651
+            MarketPlace.chown: true
652
+            MarketPlace.chgrp: true
653
+            MarketPlace.chmod: true
654
+            MarketPlace.delete: true
655
+            MarketPlace.edit_labels: true
656
+            MarketPlace.menu_labels: true
657
+    marketplaceapps-tab:
658
+        panel_tabs:
659
+            marketplaceapp_info_tab: true
660
+            marketplaceapp_templates_tab: true
661
+        table_columns:
662
+            - 0         # Checkbox
663
+            - 1         # ID
664
+            - 2         # Owner
665
+            - 3         # Group
666
+            - 4         # Name
667
+            #- 5         # Version
668
+            - 6         # Size
669
+            - 7         # State
670
+            #- 8         # Type
671
+            - 9         # Registration
672
+            - 10        # Marketplace
673
+            - 11         # Zone
674
+            #- 12        # Labels
675
+            #- 13        # Search data
676
+        actions:
677
+            MarketPlaceApp.refresh: true
678
+            MarketPlaceApp.create_dialog: true
679
+            MarketPlaceApp.download_opennebula_dialog: true
680
+            MarketPlaceApp.download_local: true
681
+            MarketPlaceApp.rename: true
682
+            MarketPlaceApp.chown: true
683
+            MarketPlaceApp.chgrp: true
684
+            MarketPlaceApp.chmod: true
685
+            MarketPlaceApp.enable: true
686
+            MarketPlaceApp.disable: true
687
+            MarketPlaceApp.delete: true
688
+            MarketPlaceApp.edit_labels: true
689
+            MarketPlaceApp.menu_labels: true
690
+    network-top-tab:
691
+        panel_tabs:
692
+        actions:
338 693
     vnets-tab:
339 694
         panel_tabs:
340
-            vnet_info_tab: false
695
+            vnet_info_tab: true
341 696
             vnet_ar_list_tab: true
342 697
             vnet_leases_tab: true
698
+            vnet_sg_list_tab: true
699
+            vnet_vr_list_tab: true
700
+            vnet_clusters_tab: false
343 701
         table_columns:
344 702
             - 0         # Checkbox
345 703
             - 1         # ID
@@ -351,10 +709,16 @@ tabs:
351 709
             #- 7         # Bridge
352 710
             - 8         # Leases
353 711
             #- 9         # VLAN ID
712
+            #- 10         # Labels
713
+            #- 11        # Search data
354 714
         actions:
355 715
             Network.refresh: true
356 716
             Network.create_dialog: false
717
+            Network.import_dialog: false
718
+            Network.update_dialog: true
719
+            Network.reserve_dialog: true
357 720
             Network.addtocluster: false
721
+            Network.rename: true
358 722
             Network.chown: false
359 723
             Network.chgrp: false
360 724
             Network.chmod: true
@@ -363,130 +727,74 @@ tabs:
363 727
             Network.release_lease: true
364 728
             Network.add_ar: false
365 729
             Network.remove_ar: true
366
-            Network.update_ar: false
367
-    marketplace-tab:
368
-        panel_tabs:
369
-            marketplace_info_tab: true
370
-        table_columns:
371
-            - 0         # Checkbox
372
-            #- 1         # ID
373
-            - 2         # Name
374
-            - 3         # Publisher
375
-            - 4         # Hypervisor
376
-            - 5         # Arch
377
-            - 6         # Format
378
-            #- 7         # Tags
379
-        actions:
380
-            Marketplace.refresh: true
381
-            Marketplace.import: true
382
-%if %%getVar('activer_oneflow', 'non') == 'oui'
383
-    oneflow-dashboard:
730
+            Network.update_ar: true
731
+            Network.edit_labels: true
732
+            Network.menu_labels: true
733
+    vnets-topology-tab:
384 734
         panel_tabs:
385
-        table_columns:
386 735
         actions:
387
-    oneflow-services:
736
+            NetworkTopology.refresh: true
737
+            NetworkTopology.fit: true
738
+            NetworkTopology.collapseVMs: true
739
+            NetworkTopology.openVMs: true
740
+    secgroups-tab:
388 741
         panel_tabs:
389
-            service_info_tab: true
390
-            service_roles_tab: true
391
-            service_log_tab: true
392
-        panel_tabs_actions:
393
-            service_roles_tab:
394
-                Role.scale: true
395
-                Role.hold: true
396
-                Role.release: true
397
-                Role.suspend: true
398
-                Role.resume: true
399
-                Role.stop: true
400
-                Role.boot: true
401
-                Role.reboot: true
402
-                Role.reboot_hard: true
403
-                Role.poweroff: true
404
-                Role.poweroff_hard: true
405
-                Role.shutdown: true
406
-                Role.shutdown_hard: true
407
-                Role.delete: true
408
-                Role.delete_recreate: true
409
-                RoleVM.hold: true
410
-                RoleVM.release: true
411
-                RoleVM.suspend: true
412
-                RoleVM.resume: true
413
-                RoleVM.stop: true
414
-                RoleVM.boot: true
415
-                RoleVM.reboot: true
416
-                RoleVM.reboot_hard: true
417
-                RoleVM.poweroff: true
418
-                RoleVM.poweroff_hard: true
419
-                RoleVM.undeploy: true
420
-                RoleVM.undeploy_hard: true
421
-                RoleVM.shutdown: true
422
-                RoleVM.shutdown_hard: true
423
-                RoleVM.delete: true
424
-                RoleVM.delete_recreate: true
425
-                RoleVM.resched: false
426
-                RoleVM.unresched: false
427
-                RoleVM.recover: false
742
+            security_group_info_tab: true
743
+            security_group_vms_tab: true
428 744
         table_columns:
429 745
             - 0         # Checkbox
430 746
             - 1         # ID
431 747
             - 2         # Owner
432 748
             - 3         # Group
433 749
             - 4         # Name
434
-            - 5         # State
750
+            #- 5         # Labels
751
+            #- 6        # Search data
435 752
         actions:
436
-            Service.refresh: true
437
-            Service.chown: false
438
-            Service.chgrp: false
439
-            Service.chmod: true
440
-            Service.shutdown: true
441
-            Service.recover: true
442
-            Service.delete: true
443
-    oneflow-templates:
753
+            SecurityGroup.refresh: true
754
+            SecurityGroup.create_dialog: true
755
+            SecurityGroup.update_dialog: true
756
+            SecurityGroup.rename: true
757
+            SecurityGroup.chown: true
758
+            SecurityGroup.chgrp: true
759
+            SecurityGroup.chmod: true
760
+            SecurityGroup.clone_dialog: true
761
+            SecurityGroup.commit_dialog: true
762
+            SecurityGroup.delete: true
763
+            SecurityGroup.edit_labels: true
764
+            SecurityGroup.menu_labels: true
765
+    support-tab:
444 766
         panel_tabs:
445
-            service_template_info_tab: true
446
-            service_template_roles_tab: true
767
+            support_info_tab: true
447 768
         table_columns:
448
-            - 0         # Checkbox
769
+            #- 0         # Checkbox
449 770
             - 1         # ID
450
-            - 2         # Owner
451
-            - 3         # Group
452
-            - 4         # Name
771
+            - 2         # Subject
772
+            - 3         # Created at
773
+            - 4         # Status
453 774
         actions:
454
-            ServiceTemplate.refresh: true
455
-            ServiceTemplate.create_dialog: true
456
-            ServiceTemplate.instantiate: true
457
-            ServiceTemplate.chown: false
458
-            ServiceTemplate.chgrp: false
459
-            ServiceTemplate.chmod: true
460
-            ServiceTemplate.delete: true
461
-%end if
462
-%if %%getVar('activer_market_views', 'non') == 'oui'
463
-    apptools-appmarket-dashboard:
775
+            Support.refresh: true
776
+            Support.create_dialog: true
777
+    settings-tab:
464 778
         panel_tabs:
465
-        table_columns:
779
+            user_info_tab: true
780
+            user_config_tab: false
781
+            user_quotas_tab: true
782
+            group_quotas_tab: true
783
+            user_accounting_tab: true
784
+            user_showback_tab: true
466 785
         actions:
467
-    apptools-appmarket-appliances:
786
+            # The buttons inside the settings-tab panel user_info_tab are
787
+            # configured with users-tab/actions; User.update_password and
788
+            # User.login_token
789
+            #
790
+            # Buttons for user_config_tab
791
+            Settings.change_language: true
792
+            Settings.change_password: true
793
+            Settings.change_view: true
794
+            Settings.ssh_key: true
795
+            Settings.login_token: true
796
+            # Edit button in user_quotas_tab
797
+            User.quotas_dialog: false
798
+    upgrade-top-tab:
468 799
         panel_tabs:
469
-            appmarketplace_info_tab: true
470
-            appmarketplace_jobs_tab: false
471
-            appmarketplace_template_tab: true
472
-        panel_tabs_actions:
473
-            appmarketplace_jobs_tab:
474
-                Job.del: false
475
-        table_columns:
476
-            - 0         # Checkbox
477
-            #- 1         # ID
478
-            - 2         # Name
479
-            #- 3         # Status
480
-            - 4         # Publisher
481
-            - 5         # Hypervisor
482
-            - 6         # Arch
483
-            - 7         # Format
484
-            #- 8         # Tags
485
-            - 9         # Created
486 800
         actions:
487
-            AppMarket.refresh: true
488
-            AppMarket.import: true
489
-            AppMarket.delete: false
490
-            AppMarket.convert: false
491
-            AppMarket.create_dialog: false
492
-%end if

+ 0
- 21
tmpl/vdcadmin.yaml View File

@@ -1,21 +0,0 @@
1
-provision_logo: images/one_small_logo.png
2
-enabled_tabs:
3
-    provision-tab: true
4
-tabs:
5
-    provision-tab:
6
-        panel_tabs:
7
-            users: true
8
-%if %%getVar('activer_oneflow', 'non') == 'oui'
9
-            flows: true
10
-%else
11
-            flows: false
12
-%end if
13
-        actions:
14
-            Template.chmod: true
15
-            Template.delete: true
16
-        dashboard:
17
-            quotas: false
18
-            vms: false
19
-            vdcquotas: true
20
-            vdcvms: true
21
-            users:  true

Loading…
Cancel
Save