Browse Source

Update Sunstone configuration files for 5.4.1

Ref: #21703
Daniel Dehennin 1 year ago
parent
commit
609c60d21f

+ 2
- 1
dicos/99_one-frontend.xml View File

@@ -3,13 +3,14 @@
3 3
     <files>
4 4
         <service>opennebula-sunstone</service>
5 5
         <file filelist='onefrontend' name='/etc/one/sunstone-server.conf'/>
6
+        <file filelist='onefrontend' name='/etc/one/sunstone-logos.yaml'/>
6 7
         <file filelist='onefrontend' name='/etc/one/sunstone-views/admin.yaml'/>
7 8
         <file filelist='onefrontend' name='/etc/one/sunstone-views/cloud.yaml'/>
8 9
         <file filelist='onefrontend' name='/etc/one/sunstone-views/admin_vcenter.yaml'/>
9 10
         <file filelist='onefrontend' name='/etc/one/sunstone-views/groupadmin.yaml'/>
10 11
         <file filelist='onefrontend' name='/etc/one/sunstone-views/user.yaml'/>
12
+        <file filelist='onefrontend' name='/etc/one/sunstone-views/cloud_vcenter.yaml'/>
11 13
         <file filelist='onefrontend' name='/etc/one/sunstone-views/groupadmin_vcenter.yaml'/>
12
-        <file filelist='onefrontend' name='/etc/one/auth/ldap_auth.conf' source='sunstone-ldap_auth.conf'/>
13 14
         <file filelist='onefrontend' name='/etc/nginx/sites-available/nebula.conf' source='nginx-nebula.conf'/>
14 15
         <file filelist='appmarket' name='/etc/one/sunstone-appmarket.conf' rm='True'/>
15 16
         <service_access service='sunstoneHttps'>

+ 144
- 101
tmpl/admin.yaml View File

@@ -1,6 +1,10 @@
1 1
 %set oneflow = %%getVar('activer_oneflow','non') == 'oui'
2 2
 small_logo: images/opennebula-5.0.png
3 3
 provision_logo: images/opennebula-5.0.png
4
+link_logo:
5
+text_link_logo:
6
+confirm_vms: false
7
+filter-view: true
4 8
 enabled_tabs:
5 9
     - dashboard-tab
6 10
     - instances-top-tab
@@ -37,7 +41,7 @@ enabled_tabs:
37 41
     - settings-tab
38 42
     - support-tab
39 43
     - upgrade-top-tab
40
-autorefresh: true
44
+    - vmgroup-tab
41 45
 features:
42 46
     # True to show showback monthly reports, and VM cost
43 47
     showback: true
@@ -50,6 +54,22 @@ features:
50 54
     # will be set to the same value as VCPU, that will still be visible for the
51 55
     # end users
52 56
     instantiate_hide_cpu: false
57
+
58
+    # False to not scale the CPU. Number [0, 1] to scale from VCPU
59
+    instantiate_cpu_factor: false
60
+
61
+    # True to show the option to make an instance persistent
62
+    instantiate_persistent: true
63
+
64
+    # True to show the datastore datatable to instantiate VM
65
+    show_ds_instantiate: true
66
+
67
+    # True to show the host datatable to instantiate VM
68
+    show_host_instantiate: true
69
+
70
+    # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
71
+    # deployed to
72
+    vcenter_vm_folder: false
53 73
 tabs:
54 74
     dashboard-tab:
55 75
         # The following widgets can be used inside any of the '_per_row' settings
@@ -87,20 +107,21 @@ tabs:
87 107
             user_groups_tab: true
88 108
             user_accounting_tab: true
89 109
             user_showback_tab: true
110
+            user_auth_tab: true
90 111
         table_columns:
91 112
             - 0         # Checkbox
92 113
             - 1         # ID
93 114
             - 2         # Name
94 115
             - 3         # Group
95 116
             - 4         # Auth driver
96
-            #- 5         # Password
117
+            #- 5        # Password
97 118
             - 6         # VMs
98 119
             - 7         # Memory
99 120
             - 8         # CPU
100
-            #- 9         # Group ID
101
-            #- 10        # Hidden User Data
102
-            #- 11        # Labels
103
-            #- 12        # Search data
121
+            #- 9        # Group ID
122
+            #- 10       # Hidden User Data
123
+            #- 11       # Labels
124
+            #- 12       # Search data
104 125
         actions:
105 126
             User.refresh: true
106 127
             User.create_dialog: true
@@ -152,7 +173,7 @@ tabs:
152 173
             - 5         # Hosts
153 174
             - 6         # VNets
154 175
             - 7         # Datastores
155
-            #- 8         # Labels
176
+            #- 8        # Labels
156 177
         actions:
157 178
             Vdc.refresh: true
158 179
             Vdc.create_dialog: true
@@ -171,7 +192,7 @@ tabs:
171 192
             - 4         # Resource ID / Owned by
172 193
             - 5         # Allowed operations
173 194
             - 6         # Zone
174
-            #- 7         # ACL String
195
+            #- 7        # ACL String
175 196
         actions:
176 197
             Acl.refresh: true
177 198
             Acl.create_dialog: true
@@ -186,12 +207,12 @@ tabs:
186 207
         table_columns:
187 208
             - 0         # Checkbox
188 209
             - 1         # ID
189
-            - 2         # Owner
190
-            - 3         # Group
191
-            - 4         # Name
210
+            - 2         # Name
211
+            - 3         # Owner
212
+            - 4         # Group
192 213
             - 5         # Registration time
193
-            #- 6         # Labels
194
-            #- 7         # Search data
214
+            #- 6        # Labels
215
+            #- 7        # Search data
195 216
         actions:
196 217
             Template.refresh: true
197 218
             Template.create_dialog: true
@@ -216,8 +237,10 @@ tabs:
216 237
             features: true
217 238
             input_output: true
218 239
             context: true
240
+            actions: true
219 241
             scheduling: true
220 242
             hybrid: true
243
+            vmgroup: true
221 244
             other: true
222 245
 %if %%oneflow
223 246
     oneflow-templates-tab:
@@ -228,9 +251,9 @@ tabs:
228 251
         table_columns:
229 252
             - 0         # Checkbox
230 253
             - 1         # ID
231
-            - 2         # Owner
232
-            - 3         # Group
233
-            - 4         # Name
254
+            - 2         # Name
255
+            - 3         # Owner
256
+            - 4         # Group
234 257
             #- 5        # Labels
235 258
             #- 6        # Search data
236 259
         actions:
@@ -254,12 +277,12 @@ tabs:
254 277
         table_columns:
255 278
             - 0         # Checkbox
256 279
             - 1         # ID
257
-            - 2         # Owner
258
-            - 3         # Group
259
-            - 4         # Name
280
+            - 2         # Name
281
+            - 3         # Owner
282
+            - 4         # Group
260 283
             - 5         # Registration time
261
-            #- 6         # Labels
262
-            #- 7         # Search data
284
+            #- 6        # Labels
285
+            #- 7        # Search data
263 286
         actions:
264 287
             VirtualRouterTemplate.refresh: true
265 288
             VirtualRouterTemplate.create_dialog: true
@@ -304,19 +327,19 @@ tabs:
304 327
         table_columns:
305 328
             - 0       # Checkbox
306 329
             - 1       # ID
307
-            - 2       # Owner
308
-            - 3       # Group
309
-            - 4       # Name
330
+            - 2       # Name
331
+            - 3       # Owner
332
+            - 4       # Group
310 333
             - 5       # Status
311
-            #- 6       # Used CPU
312
-            #- 7       # Used Memory
334
+            #- 6      # Used CPU
335
+            #- 7      # Used Memory
313 336
             - 8       # Host
314 337
             - 9       # IPs
315
-            #- 10      # Start Time
338
+            #- 10     # Start Time
316 339
             - 11      # VNC
317
-            #- 12      # Hidden Template
318
-            #- 13      # Labels
319
-            #- 14      # Search data
340
+            #- 12     # Hidden Template
341
+            #- 13     # Labels
342
+            #- 14     # Search data
320 343
         actions:
321 344
             VM.refresh: true
322 345
             VM.create_dialog: true
@@ -342,6 +365,7 @@ tabs:
342 365
             VM.terminate: true
343 366
             VM.terminate_hard: true
344 367
             VM.resize: true
368
+            VM.disk_resize: true
345 369
             VM.attachdisk: true
346 370
             VM.detachdisk: true
347 371
             VM.disk_saveas: true
@@ -400,9 +424,9 @@ tabs:
400 424
         table_columns:
401 425
             - 0         # Checkbox
402 426
             - 1         # ID
403
-            - 2         # Owner
404
-            - 3         # Group
405
-            - 4         # Name
427
+            - 2         # Name
428
+            - 3         # Owner
429
+            - 4         # Group
406 430
             - 5         # State
407 431
             #- 6        # Labels
408 432
             #- 7        # Search data
@@ -459,7 +483,7 @@ tabs:
459 483
             - 3         # Hosts
460 484
             - 4         # VNets
461 485
             - 5         # Datastores
462
-            #- 6         # Labels
486
+            #- 6        # Labels
463 487
         actions:
464 488
             Cluster.refresh: true
465 489
             Cluster.create_dialog: true
@@ -483,16 +507,16 @@ tabs:
483 507
             - 2         # Name
484 508
             - 3         # Cluster
485 509
             - 4         # RVMs
486
-            #- 5         # Real CPU
510
+            #- 5        # Real CPU
487 511
             - 6         # Allocated CPU
488
-            #- 7         # Real MEM
512
+            #- 7        # Real MEM
489 513
             - 8         # Allocated MEM
490 514
             - 9         # Status
491
-            #- 10        # IM MAD
492
-            #- 11        # VM MAD
493
-            #- 12        # Last monitored on
494
-            #- 13        # Labels
495
-            #- 14        # Search data
515
+            #- 10       # IM MAD
516
+            #- 11       # VM MAD
517
+            #- 12       # Last monitored on
518
+            #- 13       # Labels
519
+            #- 14       # Search data
496 520
         actions:
497 521
             Host.refresh: true
498 522
             Host.create_dialog: true
@@ -512,7 +536,7 @@ tabs:
512 536
             - 1         # ID
513 537
             - 2         # Name
514 538
             - 3         # Endpoint
515
-            #- 4         # Labels
539
+            #- 4        # Labels
516 540
         actions:
517 541
             Zone.refresh: true
518 542
             Zone.create_dialog: true
@@ -531,18 +555,18 @@ tabs:
531 555
         table_columns:
532 556
             - 0         # Checkbox
533 557
             - 1         # ID
534
-            - 2         # Owner
535
-            - 3         # Group
536
-            - 4         # Name
558
+            - 2         # Name
559
+            - 3         # Owner
560
+            - 4         # Group
537 561
             - 5         # Capacity
538 562
             - 6         # Cluster
539
-            #- 7         # Basepath
540
-            #- 8         # TM
541
-            #- 9         # DS
563
+            #- 7        # Basepath
564
+            #- 8        # TM
565
+            #- 9        # DS
542 566
             - 10        # Type
543 567
             - 11        # Status
544
-            #- 12        # Labels
545
-            #- 13        # Search data
568
+            #- 12       # Labels
569
+            #- 13       # Search data
546 570
         actions:
547 571
             Datastore.refresh: true
548 572
             Datastore.create_dialog: true
@@ -565,19 +589,19 @@ tabs:
565 589
         table_columns:
566 590
             - 0         # Checkbox
567 591
             - 1         # ID
568
-            - 2         # Owner
569
-            - 3         # Group
570
-            - 4         # Name
592
+            - 2         # Name
593
+            - 3         # Owner
594
+            - 4         # Group
571 595
             - 5         # Datastore
572
-            #- 6         # Size
573
-            - 7        # Type
574
-            #- 8         # Registration time
596
+            #- 6        # Size
597
+            - 7         # Type
598
+            #- 8        # Registration time
575 599
             #- 9        # Persistent
576 600
             - 10        # Status
577 601
             - 11        # #VMs
578 602
             #- 12       # Target
579 603
             #- 13       # Labels
580
-            #- 14        # Search data
604
+            #- 14       # Search data
581 605
         actions:
582 606
             Image.refresh: true
583 607
             Image.create_dialog: true
@@ -604,19 +628,19 @@ tabs:
604 628
         table_columns:
605 629
             - 0         # Checkbox
606 630
             - 1         # ID
607
-            - 2         # Owner
608
-            - 3         # Group
609
-            - 4         # Name
631
+            - 2         # Name
632
+            - 3         # Owner
633
+            - 4         # Group
610 634
             - 5         # Datastore
611
-            #- 6         # Size
612
-            - 7        # Type
613
-            #- 8         # Registration time
635
+            #- 6        # Size
636
+            - 7         # Type
637
+            #- 8        # Registration time
614 638
             #- 9        # Persistent
615 639
             - 10        # Status
616
-            #- 11        # #VMs
640
+            #- 11       # #VMs
617 641
             #- 12       # Target
618 642
             #- 13       # Labels
619
-            #- 14        # Search data
643
+            #- 14       # Search data
620 644
         actions:
621 645
             File.refresh: true
622 646
             File.create_dialog: true
@@ -636,15 +660,15 @@ tabs:
636 660
         table_columns:
637 661
             - 0         # Checkbox
638 662
             - 1         # ID
639
-            - 2         # Owner
640
-            - 3         # Group
641
-            - 4         # Name
663
+            - 2         # Name
664
+            - 3         # Owner
665
+            - 4         # Group
642 666
             - 5         # Capacity
643 667
             - 6         # Apps
644 668
             - 7         # Driver
645 669
             - 8         # Zone
646 670
             #- 9        # Labels
647
-            #- 10        # Search data
671
+            #- 10       # Search data
648 672
         actions:
649 673
             MarketPlace.refresh: true
650 674
             MarketPlace.create_dialog: true
@@ -663,18 +687,18 @@ tabs:
663 687
         table_columns:
664 688
             - 0         # Checkbox
665 689
             - 1         # ID
666
-            - 2         # Owner
667
-            - 3         # Group
668
-            - 4         # Name
669
-            #- 5         # Version
690
+            - 2         # Name
691
+            - 3         # Owner
692
+            - 4         # Group
693
+            #- 5        # Version
670 694
             - 6         # Size
671 695
             - 7         # State
672
-            #- 8         # Type
696
+            #- 8        # Type
673 697
             - 9         # Registration
674 698
             - 10        # Marketplace
675
-            - 11         # Zone
676
-            #- 12        # Labels
677
-            #- 13        # Search data
699
+            - 11        # Zone
700
+            #- 12       # Labels
701
+            #- 13       # Search data
678 702
         actions:
679 703
             MarketPlaceApp.refresh: true
680 704
             MarketPlaceApp.create_dialog: true
@@ -703,16 +727,16 @@ tabs:
703 727
         table_columns:
704 728
             - 0         # Checkbox
705 729
             - 1         # ID
706
-            - 2         # Owner
707
-            - 3         # Group
708
-            - 4         # Name
730
+            - 2         # Name
731
+            - 3         # Owner
732
+            - 4         # Group
709 733
             - 5         # Reservation
710 734
             - 6         # Cluster
711
-            #- 7         # Bridge
735
+            #- 7        # Bridge
712 736
             - 8         # Leases
713
-            #- 9         # VLAN ID
714
-            #- 10         # Labels
715
-            #- 11        # Search data
737
+            #- 9        # VLAN ID
738
+            #- 10       # Labels
739
+            #- 11       # Search data
716 740
         actions:
717 741
             Network.refresh: true
718 742
             Network.create_dialog: true
@@ -746,10 +770,10 @@ tabs:
746 770
         table_columns:
747 771
             - 0         # Checkbox
748 772
             - 1         # ID
749
-            - 2         # Owner
750
-            - 3         # Group
751
-            - 4         # Name
752
-            #- 5         # Labels
773
+            - 2         # Name
774
+            - 3         # Owner
775
+            - 4         # Group
776
+            #- 5        # Labels
753 777
             #- 6        # Search data
754 778
         actions:
755 779
             SecurityGroup.refresh: true
@@ -768,7 +792,7 @@ tabs:
768 792
         panel_tabs:
769 793
             support_info_tab: true
770 794
         table_columns:
771
-            #- 0         # Checkbox
795
+            #- 0        # Checkbox
772 796
             - 1         # ID
773 797
             - 2         # Subject
774 798
             - 3         # Created at
@@ -778,25 +802,44 @@ tabs:
778 802
             Support.create_dialog: true
779 803
     settings-tab:
780 804
         panel_tabs:
781
-            user_info_tab: true
782
-            user_config_tab: false
783
-            user_quotas_tab: true
784
-            group_quotas_tab: true
785
-            user_accounting_tab: true
786
-            user_showback_tab: true
805
+            settings_info_tab: true
806
+            settings_config_tab: false
807
+            settings_quotas_tab: true
808
+            settings_group_quotas_tab: true
809
+            settings_accounting_tab: true
810
+            settings_showback_tab: true
811
+            settings_auth_tab: true
787 812
         actions:
788
-            # The buttons inside the settings-tab panel user_info_tab are
789
-            # configured with users-tab/actions; User.update_password and
790
-            # User.login_token
791
-            #
792
-            # Buttons for user_config_tab
813
+            # Buttons for settings_info_tab
814
+            User.update_password: true
815
+            User.login_token: true
816
+            # Buttons for settings_config_tab
793 817
             Settings.change_language: true
794 818
             Settings.change_password: true
795 819
             Settings.change_view: true
796 820
             Settings.ssh_key: true
797 821
             Settings.login_token: true
798
-            # Edit button in user_quotas_tab
822
+            # Edit button in settings_quotas_tab
799 823
             User.quotas_dialog: false
800 824
     upgrade-top-tab:
801 825
         panel_tabs:
802 826
         actions:
827
+    vmgroup-tab:
828
+        panel_tabs:
829
+            vm_group_info_tab: true
830
+            vm_group_vms_tab: true
831
+        table_columns:
832
+            - 0         # Checkbox
833
+            - 1         # ID
834
+            - 2         # Name
835
+            - 3         # Owner
836
+            - 4         # Group
837
+            - 5         # Vms
838
+            #- 6        # Labels
839
+            #- 7        # Search data
840
+        actions:
841
+           VMGroup.create_dialog: true
842
+           VMGroup.update_dialog: true
843
+           VMGroup.chmod: true
844
+           VMGroup.chown: true
845
+           VMGroup.chgrp: true

+ 170
- 130
tmpl/admin_vcenter.yaml View File

@@ -1,6 +1,10 @@
1 1
 %set oneflow = %%getVar('activer_oneflow','non') == 'oui'
2 2
 small_logo: images/opennebula-5.0.png
3 3
 provision_logo: images/opennebula-5.0.png
4
+link_logo:
5
+text_link_logo:
6
+confirm_vms: false
7
+filter-view: true
4 8
 enabled_tabs:
5 9
     - dashboard-tab
6 10
     - instances-top-tab
@@ -37,7 +41,7 @@ enabled_tabs:
37 41
     - settings-tab
38 42
     - support-tab
39 43
     - upgrade-top-tab
40
-autorefresh: true
44
+    - vmgroup-tab
41 45
 features:
42 46
     # True to show showback monthly reports, and VM cost
43 47
     showback: true
@@ -50,6 +54,22 @@ features:
50 54
     # will be set to the same value as VCPU, that will still be visible for the
51 55
     # end users
52 56
     instantiate_hide_cpu: false
57
+
58
+    # False to not scale the CPU. Number [0, 1] to scale from VCPU
59
+    instantiate_cpu_factor: false
60
+
61
+    # True to show the option to make an instance persistent
62
+    instantiate_persistent: true
63
+
64
+    # True to show the datastore datatable to instantiate VM
65
+    show_ds_instantiate: false
66
+
67
+    # True to show the host datatable to instantiate VM
68
+    show_host_instantiate: false
69
+
70
+    # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
71
+    # deployed to
72
+    vcenter_vm_folder: true
53 73
 tabs:
54 74
     dashboard-tab:
55 75
         # The following widgets can be used inside any of the '_per_row' settings
@@ -85,20 +105,21 @@ tabs:
85 105
             user_groups_tab: true
86 106
             user_accounting_tab: true
87 107
             user_showback_tab: true
108
+            user_auth_tab: true
88 109
         table_columns:
89 110
             - 0         # Checkbox
90 111
             - 1         # ID
91 112
             - 2         # Name
92 113
             - 3         # Group
93 114
             - 4         # Auth driver
94
-            #- 5         # Password
115
+            #- 5        # Password
95 116
             - 6         # VMs
96 117
             - 7         # Memory
97 118
             - 8         # CPU
98
-            #- 9         # Group ID
99
-            #- 10        # Hidden User Data
100
-            #- 11        # Labels
101
-            #- 12        # Search data
119
+            #- 9        # Group ID
120
+            #- 10       # Hidden User Data
121
+            #- 11       # Labels
122
+            #- 12       # Search data
102 123
         actions:
103 124
             User.refresh: true
104 125
             User.create_dialog: true
@@ -126,8 +147,7 @@ tabs:
126 147
             - 4         # VMs
127 148
             - 5         # Memory
128 149
             - 6         # CPU
129
-            #- 7         # Labels
130
-            #- 8        # Search data
150
+            #- 7        # Labels
131 151
         actions:
132 152
             Group.refresh: true
133 153
             Group.create_dialog: true
@@ -151,8 +171,7 @@ tabs:
151 171
             - 5         # Hosts
152 172
             - 6         # VNets
153 173
             - 7         # Datastores
154
-            #- 8         # Labels
155
-            #- 9        # Search data
174
+            #- 8        # Labels
156 175
         actions:
157 176
             Vdc.refresh: true
158 177
             Vdc.create_dialog: true
@@ -171,7 +190,7 @@ tabs:
171 190
             - 4         # Resource ID / Owned by
172 191
             - 5         # Allowed operations
173 192
             - 6         # Zone
174
-            #- 7         # ACL String
193
+            #- 7        # ACL String
175 194
         actions:
176 195
             Acl.refresh: true
177 196
             Acl.create_dialog: true
@@ -186,11 +205,11 @@ tabs:
186 205
         table_columns:
187 206
             - 0         # Checkbox
188 207
             - 1         # ID
189
-            - 2         # Owner
190
-            - 3         # Group
191
-            - 4         # Name
208
+            - 2         # Name
209
+            - 3         # Owner
210
+            - 4         # Group
192 211
             - 5         # Registration time
193
-            #- 6         # Labels
212
+            #- 6        # Labels
194 213
             #- 7        # Search data
195 214
         actions:
196 215
             Template.refresh: true
@@ -216,8 +235,10 @@ tabs:
216 235
             features: true
217 236
             input_output: true
218 237
             context: true
238
+            actions: true
219 239
             scheduling: true
220 240
             hybrid: true
241
+            vmgroup: true
221 242
             other: true
222 243
 %if %%oneflow
223 244
     oneflow-templates-tab:
@@ -228,9 +249,9 @@ tabs:
228 249
         table_columns:
229 250
             - 0         # Checkbox
230 251
             - 1         # ID
231
-            - 2         # Owner
232
-            - 3         # Group
233
-            - 4         # Name
252
+            - 2         # Name
253
+            - 3         # Owner
254
+            - 4         # Group
234 255
             #- 5        # Labels
235 256
             #- 6        # Search data
236 257
         actions:
@@ -254,11 +275,11 @@ tabs:
254 275
         table_columns:
255 276
             - 0         # Checkbox
256 277
             - 1         # ID
257
-            - 2         # Owner
258
-            - 3         # Group
259
-            - 4         # Name
278
+            - 2         # Name
279
+            - 3         # Owner
280
+            - 4         # Group
260 281
             - 5         # Registration time
261
-            #- 6         # Labels
282
+            #- 6        # Labels
262 283
             #- 7        # Search data
263 284
         actions:
264 285
             VirtualRouterTemplate.refresh: true
@@ -304,19 +325,19 @@ tabs:
304 325
         table_columns:
305 326
             - 0       # Checkbox
306 327
             - 1       # ID
307
-            - 2       # Owner
308
-            - 3       # Group
309
-            - 4       # Name
328
+            - 2       # Name
329
+            - 3       # Owner
330
+            - 4       # Group
310 331
             - 5       # Status
311
-            #- 6       # Used CPU
312
-            #- 7       # Used Memory
332
+            #- 6      # Used CPU
333
+            #- 7      # Used Memory
313 334
             - 8       # Host
314 335
             - 9       # IPs
315
-            #- 10      # Start Time
336
+            #- 10     # Start Time
316 337
             - 11      # VNC
317
-            #- 12      # Hidden Template
318
-            #- 13      # Labels
319
-            #- 14        # Search data
338
+            #- 12     # Hidden Template
339
+            #- 13     # Labels
340
+            #- 14     # Search data
320 341
         actions:
321 342
             VM.refresh: true
322 343
             VM.create_dialog: true
@@ -344,7 +365,8 @@ tabs:
344 365
             VM.resize: true
345 366
             VM.attachdisk: true
346 367
             VM.detachdisk: true
347
-            VM.disk_saveas: false
368
+            VM.disk_saveas: true
369
+            VM.disk_resize: true
348 370
             VM.attachnic: true
349 371
             VM.detachnic: true
350 372
             VM.snapshot_create: true
@@ -359,7 +381,6 @@ tabs:
359 381
             VM.updateconf: true
360 382
             VM.edit_labels: true
361 383
             VM.menu_labels: true
362
-%if %%oneflow
363 384
     oneflow-services-tab:
364 385
         panel_tabs:
365 386
             service_info_tab: true
@@ -400,9 +421,9 @@ tabs:
400 421
         table_columns:
401 422
             - 0         # Checkbox
402 423
             - 1         # ID
403
-            - 2         # Owner
404
-            - 3         # Group
405
-            - 4         # Name
424
+            - 2         # Name
425
+            - 3         # Owner
426
+            - 4         # Group
406 427
             - 5         # State
407 428
             #- 6        # Labels
408 429
             #- 7        # Search data
@@ -419,6 +440,30 @@ tabs:
419 440
             Service.edit_labels: true
420 441
             Service.menu_labels: true
421 442
 %end if
443
+    vrouters-tab:
444
+        panel_tabs:
445
+            virtual_router_info_tab: true
446
+            virtual_router_vms_tab: true
447
+        table_columns:
448
+            - 0         # Checkbox
449
+            - 1         # ID
450
+            - 2         # Name
451
+            - 3         # Owner
452
+            - 4         # Group
453
+            #- 5        # Labels
454
+            #- 6        # Search data
455
+        actions:
456
+            VirtualRouter.refresh: true
457
+            VirtualRouter.create_dialog: true
458
+            VirtualRouter.rename: true
459
+            VirtualRouter.chown: true
460
+            VirtualRouter.chgrp: true
461
+            VirtualRouter.chmod: true
462
+            VirtualRouter.delete: true
463
+            VirtualRouter.attachnic: true
464
+            VirtualRouter.detachnic: true
465
+            VirtualRouter.edit_labels: true
466
+            VirtualRouter.menu_labels: true
422 467
     infrastructure-top-tab:
423 468
         panel_tabs:
424 469
         actions:
@@ -435,7 +480,7 @@ tabs:
435 480
             - 3         # Hosts
436 481
             - 4         # VNets
437 482
             - 5         # Datastores
438
-            #- 6         # Labels
483
+            #- 6        # Labels
439 484
         actions:
440 485
             Cluster.refresh: true
441 486
             Cluster.create_dialog: true
@@ -459,16 +504,16 @@ tabs:
459 504
             - 2         # Name
460 505
             - 3         # Cluster
461 506
             - 4         # RVMs
462
-            #- 5         # Real CPU
507
+            #- 5        # Real CPU
463 508
             - 6         # Allocated CPU
464
-            #- 7         # Real MEM
509
+            #- 7        # Real MEM
465 510
             - 8         # Allocated MEM
466 511
             - 9         # Status
467
-            #- 10        # IM MAD
468
-            #- 11        # VM MAD
469
-            #- 12        # Last monitored on
470
-            #- 13        # Labels
471
-            #- 14        # Search data
512
+            #- 10       # IM MAD
513
+            #- 11       # VM MAD
514
+            #- 12       # Last monitored on
515
+            #- 13       # Labels
516
+            #- 14       # Search data
472 517
         actions:
473 518
             Host.refresh: true
474 519
             Host.create_dialog: true
@@ -488,7 +533,7 @@ tabs:
488 533
             - 1         # ID
489 534
             - 2         # Name
490 535
             - 3         # Endpoint
491
-            #- 4         # Labels
536
+            #- 4        # Labels
492 537
         actions:
493 538
             Zone.refresh: true
494 539
             Zone.create_dialog: true
@@ -507,21 +552,21 @@ tabs:
507 552
         table_columns:
508 553
             - 0         # Checkbox
509 554
             - 1         # ID
510
-            - 2         # Owner
511
-            - 3         # Group
512
-            - 4         # Name
555
+            - 2         # Name
556
+            - 3         # Owner
557
+            - 4         # Group
513 558
             - 5         # Capacity
514 559
             - 6         # Cluster
515
-            #- 7         # Basepath
516
-            #- 8         # TM
517
-            #- 9         # DS
560
+            #- 7        # Basepath
561
+            #- 8        # TM
562
+            #- 9        # DS
518 563
             - 10        # Type
519 564
             - 11        # Status
520
-            #- 12        # Labels
521
-            #- 13        # Search data
565
+            #- 12       # Labels
566
+            #- 13       # Search data
522 567
         actions:
523 568
             Datastore.refresh: true
524
-            Datastore.create_dialog: true
569
+            Datastore.create_dialog: false
525 570
             Datastore.import_dialog: true
526 571
             Datastore.addtocluster: true
527 572
             Datastore.rename: true
@@ -541,24 +586,24 @@ tabs:
541 586
         table_columns:
542 587
             - 0         # Checkbox
543 588
             - 1         # ID
544
-            - 2         # Owner
545
-            - 3         # Group
546
-            - 4         # Name
589
+            - 2         # Name
590
+            - 3         # Owner
591
+            - 4         # Group
547 592
             - 5         # Datastore
548
-            #- 6         # Size
549
-            - 7        # Type
550
-            #- 8         # Registration time
593
+            #- 6        # Size
594
+            - 7         # Type
595
+            #- 8        # Registration time
551 596
             #- 9        # Persistent
552 597
             - 10        # Status
553 598
             - 11        # #VMs
554 599
             #- 12       # Target
555 600
             #- 13       # Labels
556
-            #- 14        # Search data
601
+            #- 14       # Search data
557 602
         actions:
558 603
             Image.refresh: true
559 604
             Image.create_dialog: true
560
-            Image.upload_marketplace_dialog: false
561 605
             Image.import_dialog: true
606
+            Image.upload_marketplace_dialog: false
562 607
             Image.rename: true
563 608
             Image.chown: true
564 609
             Image.chgrp: true
@@ -580,19 +625,19 @@ tabs:
580 625
         table_columns:
581 626
             - 0         # Checkbox
582 627
             - 1         # ID
583
-            - 2         # Owner
584
-            - 3         # Group
585
-            - 4         # Name
628
+            - 2         # Name
629
+            - 3         # Owner
630
+            - 4         # Group
586 631
             - 5         # Datastore
587
-            #- 6         # Size
588
-            - 7        # Type
589
-            #- 8         # Registration time
632
+            #- 6        # Size
633
+            - 7         # Type
634
+            #- 8        # Registration time
590 635
             #- 9        # Persistent
591 636
             - 10        # Status
592
-            #- 11        # #VMs
637
+            #- 11       # #VMs
593 638
             #- 12       # Target
594 639
             #- 13       # Labels
595
-            #- 14        # Search data
640
+            #- 14       # Search data
596 641
         actions:
597 642
             File.refresh: true
598 643
             File.create_dialog: true
@@ -612,15 +657,15 @@ tabs:
612 657
         table_columns:
613 658
             - 0         # Checkbox
614 659
             - 1         # ID
615
-            - 2         # Owner
616
-            - 3         # Group
617
-            - 4         # Name
660
+            - 2         # Name
661
+            - 3         # Owner
662
+            - 4         # Group
618 663
             - 5         # Capacity
619 664
             - 6         # Apps
620 665
             - 7         # Driver
621 666
             - 8         # Zone
622 667
             #- 9        # Labels
623
-            #- 10        # Search data
668
+            #- 10       # Search data
624 669
         actions:
625 670
             MarketPlace.refresh: true
626 671
             MarketPlace.create_dialog: true
@@ -639,18 +684,18 @@ tabs:
639 684
         table_columns:
640 685
             - 0         # Checkbox
641 686
             - 1         # ID
642
-            - 2         # Owner
643
-            - 3         # Group
644
-            - 4         # Name
645
-            #- 5         # Version
687
+            - 2         # Name
688
+            - 3         # Owner
689
+            - 4         # Group
690
+            #- 5        # Version
646 691
             - 6         # Size
647 692
             - 7         # State
648
-            #- 8         # Type
693
+            #- 8        # Type
649 694
             - 9         # Registration
650 695
             - 10        # Marketplace
651
-            - 11         # Zone
652
-            #- 12        # Labels
653
-            #- 13        # Search data
696
+            - 11        # Zone
697
+            #- 12       # Labels
698
+            #- 13       # Search data
654 699
         actions:
655 700
             MarketPlaceApp.refresh: true
656 701
             MarketPlaceApp.create_dialog: true
@@ -679,16 +724,16 @@ tabs:
679 724
         table_columns:
680 725
             - 0         # Checkbox
681 726
             - 1         # ID
682
-            - 2         # Owner
683
-            - 3         # Group
684
-            - 4         # Name
727
+            - 2         # Name
728
+            - 3         # Owner
729
+            - 4         # Group
685 730
             - 5         # Reservation
686 731
             - 6         # Cluster
687
-            #- 7         # Bridge
732
+            #- 7        # Bridge
688 733
             - 8         # Leases
689
-            #- 9         # VLAN ID
690
-            #- 10         # Labels
691
-            #- 11        # Search data
734
+            #- 9        # VLAN ID
735
+            #- 10       # Labels
736
+            #- 11       # Search data
692 737
         actions:
693 738
             Network.refresh: true
694 739
             Network.create_dialog: true
@@ -708,30 +753,6 @@ tabs:
708 753
             Network.update_ar: true
709 754
             Network.edit_labels: true
710 755
             Network.menu_labels: true
711
-    vrouters-tab:
712
-        panel_tabs:
713
-            virtual_router_info_tab: true
714
-            virtual_router_vms_tab: true
715
-        table_columns:
716
-            - 0         # Checkbox
717
-            - 1         # ID
718
-            - 2         # Owner
719
-            - 3         # Group
720
-            - 4         # Name
721
-            #- 5        # Labels
722
-            #- 6        # Search data
723
-        actions:
724
-            VirtualRouter.refresh: true
725
-            VirtualRouter.create_dialog: true
726
-            VirtualRouter.rename: true
727
-            VirtualRouter.chown: true
728
-            VirtualRouter.chgrp: true
729
-            VirtualRouter.chmod: true
730
-            VirtualRouter.delete: true
731
-            VirtualRouter.attachnic: true
732
-            VirtualRouter.detachnic: true
733
-            VirtualRouter.edit_labels: true
734
-            VirtualRouter.menu_labels: true
735 756
     vnets-topology-tab:
736 757
         panel_tabs:
737 758
         actions:
@@ -746,10 +767,10 @@ tabs:
746 767
         table_columns:
747 768
             - 0         # Checkbox
748 769
             - 1         # ID
749
-            - 2         # Owner
750
-            - 3         # Group
751
-            - 4         # Name
752
-            #- 5         # Labels
770
+            - 2         # Name
771
+            - 3         # Owner
772
+            - 4         # Group
773
+            #- 5        # Labels
753 774
             #- 6        # Search data
754 775
         actions:
755 776
             SecurityGroup.refresh: true
@@ -768,7 +789,7 @@ tabs:
768 789
         panel_tabs:
769 790
             support_info_tab: true
770 791
         table_columns:
771
-            #- 0         # Checkbox
792
+            #- 0        # Checkbox
772 793
             - 1         # ID
773 794
             - 2         # Subject
774 795
             - 3         # Created at
@@ -778,25 +799,44 @@ tabs:
778 799
             Support.create_dialog: true
779 800
     settings-tab:
780 801
         panel_tabs:
781
-            user_info_tab: true
782
-            user_config_tab: false
783
-            user_quotas_tab: true
784
-            group_quotas_tab: true
785
-            user_accounting_tab: true
786
-            user_showback_tab: true
802
+            settings_info_tab: true
803
+            settings_config_tab: false
804
+            settings_quotas_tab: true
805
+            settings_group_quotas_tab: true
806
+            settings_accounting_tab: true
807
+            settings_showback_tab: true
808
+            settings_auth_tab: true
787 809
         actions:
788
-            # The buttons inside the settings-tab panel user_info_tab are
789
-            # configured with users-tab/actions; User.update_password and
790
-            # User.login_token
791
-            #
792
-            # Buttons for user_config_tab
810
+            # Buttons for settings_info_tab
811
+            User.update_password: true
812
+            User.login_token: true
813
+            # Buttons for settings_config_tab
793 814
             Settings.change_language: true
794 815
             Settings.change_password: true
795 816
             Settings.change_view: true
796 817
             Settings.ssh_key: true
797 818
             Settings.login_token: true
798
-            # Edit button in user_quotas_tab
819
+            # Edit button in settings_quotas_tab
799 820
             User.quotas_dialog: false
800 821
     upgrade-top-tab:
801 822
         panel_tabs:
802 823
         actions:
824
+    vmgroup-tab:
825
+        panel_tabs:
826
+            vm_group_info_tab: true
827
+            vm_group_vms_tab: true
828
+        table_columns:
829
+            - 0         # Checkbox
830
+            - 1         # ID
831
+            - 2         # Name
832
+            - 3         # Owner
833
+            - 4         # Group
834
+            - 5         # Vms
835
+            #- 6        # Labels
836
+            #- 7        # Search data
837
+        actions:
838
+           VMGroup.create_dialog: true
839
+           VMGroup.update_dialog: true
840
+           VMGroup.chmod: true
841
+           VMGroup.chown: true
842
+           VMGroup.chgrp: true

+ 76
- 33
tmpl/cloud.yaml View File

@@ -1,4 +1,8 @@
1
+%set oneflow = %%getVar('activer_oneflow','non') == 'oui'
1 2
 provision_logo: images/opennebula-5.0.png
3
+link_logo:
4
+text_link_logo:
5
+confirm_vms: false
2 6
 enabled_tabs:
3 7
     - provision-tab
4 8
     - settings-tab
@@ -14,6 +18,15 @@ features:
14 18
     # will be set to the same value as VCPU, that will still be visible for the
15 19
     # end users
16 20
     instantiate_hide_cpu: false
21
+    
22
+    # False to not scale the CPU. Number [0, 1] to scale from VCPU
23
+    instantiate_cpu_factor: false
24
+
25
+    # True to show the option to make an instance persistent
26
+    instantiate_persistent: true
27
+
28
+    # True to allow to create machines to cloud users
29
+    cloud_vm_create: true
17 30
 tabs:
18 31
     provision-tab:
19 32
         panel_tabs:
@@ -28,6 +41,11 @@ tabs:
28 41
             vm_template_tab: false
29 42
             vm_log_tab: false
30 43
         provision_tabs:
44
+%if %%oneflow
45
+            flows: true
46
+%else
47
+            flows: false
48
+%end if
31 49
             templates: true
32 50
         actions: &provisionactions
33 51
             # In the cloud view, delete is the equivalent
@@ -74,45 +92,44 @@ tabs:
74 92
             capacity_select: true
75 93
             # True to allow NIC customization
76 94
             network_select: true
95
+            # True to allow vmgroup customization
96
+            vmgroup_select: true
77 97
             # True to allow DISK size customization
78 98
             disk_resize: true
99
+            # True to allow datastore customization
100
+            datastore_select: true
79 101
     settings-tab:
80 102
         panel_tabs:
81
-            user_info_tab: false
82
-            user_config_tab: true
83
-            user_quotas_tab: true
84
-            user_accounting_tab: true
85
-            user_showback_tab: true
103
+            settings_info_tab: false
104
+            settings_config_tab: true
105
+            settings_quotas_tab: true
106
+            settings_accounting_tab: true
107
+            settings_showback_tab: true
86 108
         actions:
87
-            # The buttons inside the settings-tab panel user_info_tab are
88
-            # configured with users-tab/actions; User.update_password and
89
-            # User.login_token
90
-            #
91
-            # Buttons for user_config_tab
109
+            # Buttons for settings_info_tab
110
+            User.update_password: true
111
+            User.login_token: true
112
+            # Buttons for settings_config_tab
92 113
             Settings.change_language: true
93 114
             Settings.change_password: true
94 115
             Settings.change_view: true
95 116
             Settings.ssh_key: true
96 117
             Settings.login_token: true
97
-            # Edit button in user_quotas_tab
118
+            # Edit button in settings_quotas_tab
98 119
             User.quotas_dialog: false
99
-    users-tab:
100
-        actions:
101
-            User.update_password: true
102
-            User.login_token: true
103 120
     vms-tab:
104 121
         actions: *provisionactions
105 122
     images-tab:
106 123
         table_columns:
107 124
             - 0         # Checkbox
108 125
             - 1         # ID
109
-            - 2         # Owner
110
-            - 3         # Group
111
-            - 4         # Name
126
+            - 2         # Name
127
+            - 3         # Onwer
128
+            - 4         # Group
112 129
             - 5         # Datastore
113
-            #- 6         # Size
114
-            - 7        # Type
115
-            #- 8         # Registration time
130
+            #- 6        # Size
131
+            - 7         # Type
132
+            #- 8        # Registration time
116 133
             #- 9        # Persistent
117 134
             - 10        # Status
118 135
             - 11        # #VMs
@@ -121,19 +138,45 @@ tabs:
121 138
         table_columns:
122 139
             - 0         # Checkbox
123 140
             - 1         # ID
124
-            - 2         # Owner
125
-            #- 3         # Group
126
-            - 4         # Name
127
-            #- 5         # Reservation
128
-            #- 6         # Cluster
129
-            #- 7         # Bridge
130
-            #- 8         # Leases
131
-            #- 9         # VLAN ID
141
+            - 2         # Name
142
+            #- 3        # Owner
143
+            - 4         # Group
144
+            #- 5        # Reservation
145
+            #- 6        # Cluster
146
+            #- 7        # Bridge
147
+            #- 8        # Leases
148
+            #- 9        # VLAN ID
132 149
     secgroups-tab:
133 150
         table_columns:
134 151
             - 0         # Checkbox
135 152
             - 1         # ID
136
-            - 2         # Owner
137
-            #- 3         # Group
138
-            - 4         # Name
139
-            #- 5         # Labels
153
+            - 2         # Name
154
+            #- 3        # Owner
155
+            - 4         # Group
156
+            #- 5        # Labels
157
+    vmgroup-tab:
158
+        table_columns:
159
+            - 0         # Checkbox
160
+            - 1         # ID
161
+            - 2         # Name
162
+            - 3         # Owner
163
+            - 4         # Group
164
+            - 5         # Vms
165
+            #- 6        # Labels
166
+            #- 7        # Search data
167
+    datastores-tab:
168
+        table_columns:
169
+            - 0         # Checkbox
170
+            - 1         # ID
171
+            - 2         # Name
172
+            - 3         # Owner
173
+            - 4         # Group
174
+            #- 5        # Capacity
175
+            #- 6        # Cluster
176
+            #- 7        # Basepath
177
+            #- 8        # TM
178
+            #- 9        # DS
179
+            #- 10       # Type
180
+            - 11        # Status
181
+            #- 12       # Labels
182
+            #- 13       # Search data

+ 157
- 0
tmpl/cloud_vcenter.yaml View File

@@ -0,0 +1,157 @@
1
+%set oneflow = %%getVar('activer_oneflow','non') == 'oui'
2
+provision_logo: images/opennebula-5.0.png
3
+link_logo:
4
+text_link_logo:
5
+confirm_vms: false
6
+enabled_tabs:
7
+    - provision-tab
8
+    - settings-tab
9
+features:
10
+    # True to show showback monthly reports, and VM cost
11
+    showback: true
12
+
13
+    # Allows to change the security groups for each network interface
14
+    # on the VM creation dialog
15
+    secgroups: false
16
+
17
+    # True to hide the CPU setting in the VM creation dialog. The CPU setting
18
+    # will be set to the same value as VCPU, that will still be visible for the
19
+    # end users
20
+    instantiate_hide_cpu: true
21
+
22
+    # False to not scale the CPU. Number [0, 1] to scale from VCPU
23
+    instantiate_cpu_factor: false
24
+
25
+    # True to show the option to make an instance persistent
26
+    instantiate_persistent: true
27
+
28
+    # True to allow to create machines to cloud users
29
+    cloud_vm_create: true
30
+tabs:
31
+    provision-tab:
32
+        panel_tabs:
33
+            vm_info_tab: false
34
+            vm_capacity_tab: false
35
+            vm_storage_tab: false
36
+            vm_network_tab: false
37
+            vm_snapshot_tab: false
38
+            vm_placement_tab: false
39
+            vm_actions_tab: false
40
+            vm_conf_tab: false
41
+            vm_template_tab: false
42
+            vm_log_tab: false
43
+        provision_tabs:
44
+%if %%oneflow
45
+            flows: true
46
+%else
47
+            flows: false
48
+%end if
49
+            templates: false
50
+        actions: &provisionactions
51
+            # In the cloud view, delete is the equivalent
52
+            # of 'onetemplate chmod --recursive'
53
+            Template.chmod: false
54
+
55
+            # In the cloud view, delete is the equivalent
56
+            # of 'onetemplate delete --recursive'
57
+            Template.delete: true
58
+            VM.rename: false
59
+            VM.resume: true
60
+            VM.reboot: true
61
+            VM.reboot_hard: true
62
+            VM.poweroff: true
63
+            VM.poweroff_hard: true
64
+            VM.undeploy: false
65
+            VM.undeploy_hard: false
66
+            VM.terminate: true
67
+            VM.terminate_hard: true
68
+            VM.resize: false
69
+            VM.attachdisk: false
70
+            VM.detachdisk: false
71
+            VM.disk_saveas: false
72
+            VM.attachnic: false
73
+            VM.detachnic: false
74
+            VM.snapshot_create: false
75
+            VM.snapshot_revert: false
76
+            VM.snapshot_delete: false
77
+            VM.disk_snapshot_create: false
78
+            VM.disk_snapshot_revert: false
79
+            VM.disk_snapshot_delete: false
80
+            VM.save_as_template: true
81
+        dashboard:
82
+            # Connected user's quotas
83
+            quotas: true
84
+            # Overview of connected user's VMs
85
+            vms: true
86
+            # Group's quotas
87
+            groupquotas: false
88
+            # Overview of group's VMs
89
+            groupvms: false
90
+        create_vm:
91
+            # True to allow capacity (CPU, MEMORY, VCPU) customization
92
+            capacity_select: true
93
+            # True to allow NIC customization
94
+            network_select: true
95
+            # True to allow DISK size customization
96
+            disk_resize: true
97
+    settings-tab:
98
+        panel_tabs:
99
+            settings_info_tab: false
100
+            settings_config_tab: true
101
+            settings_quotas_tab: true
102
+            settings_accounting_tab: true
103
+            settings_showback_tab: true
104
+        actions:
105
+            # The buttons inside the settings-tab panel settings_info_tab are
106
+            # configured with users-tab/actions; User.update_password and
107
+            # User.login_token
108
+            #
109
+            # Buttons for settings_config_tab
110
+            Settings.change_language: true
111
+            Settings.change_password: true
112
+            Settings.change_view: true
113
+            Settings.ssh_key: true
114
+            Settings.login_token: true
115
+            # Edit button in settings_quotas_tab
116
+            User.quotas_dialog: false
117
+    users-tab:
118
+        actions:
119
+            User.update_password: true
120
+            User.login_token: true
121
+    vms-tab:
122
+        actions: *provisionactions
123
+    images-tab:
124
+        table_columns:
125
+            - 0         # Checkbox
126
+            - 1         # ID
127
+            - 2         # Name
128
+            - 3         # Owner
129
+            - 4         # Group
130
+            - 5         # Datastore
131
+            #- 6        # Size
132
+            - 7         # Type
133
+            #- 8        # Registration time
134
+            #- 9        # Persistent
135
+            - 10        # Status
136
+            - 11        # #VMs
137
+            #- 12       # Target
138
+    vnets-tab:
139
+        table_columns:
140
+            - 0         # Checkbox
141
+            - 1         # ID
142
+            - 2         # Name
143
+            #- 3        # Owner
144
+            - 4         # Group
145
+            #- 5        # Reservation
146
+            #- 6        # Cluster
147
+            #- 7        # Bridge
148
+            #- 8        # Leases
149
+            #- 9        # VLAN ID
150
+    secgroups-tab:
151
+        table_columns:
152
+            - 0         # Checkbox
153
+            - 1         # ID
154
+            - 2         # Name
155
+            #- 3        # Owner
156
+            - 4         # Group
157
+            #- 5        # Labels

+ 186
- 141
tmpl/groupadmin.yaml View File

@@ -1,6 +1,10 @@
1 1
 %set oneflow = %%getVar('activer_oneflow','non') == 'oui'
2 2
 small_logo: images/opennebula-5.0.png
3 3
 provision_logo: images/opennebula-5.0.png
4
+link_logo:
5
+text_link_logo:
6
+confirm_vms: false
7
+filter-view: true
4 8
 enabled_tabs:
5 9
     - dashboard-tab
6 10
     - instances-top-tab
@@ -15,10 +19,6 @@ enabled_tabs:
15 19
     - oneflow-templates-tab
16 20
 %end if
17 21
     - vrouter-templates-tab
18
-    #- infrastructure-top-tab
19
-    #- clusters-tab
20
-    #- hosts-tab
21
-    #- zones-tab
22 22
     #- storage-top-tab
23 23
     #- datastores-tab
24 24
     #- images-tab
@@ -29,6 +29,10 @@ enabled_tabs:
29 29
     - vnets-tab
30 30
     - vnets-topology-tab
31 31
     - secgroups-tab
32
+    #- infrastructure-top-tab
33
+    #- clusters-tab
34
+    #- hosts-tab
35
+    #- zones-tab
32 36
     - system-top-tab
33 37
     - users-tab
34 38
     - groups-tab
@@ -36,7 +40,8 @@ enabled_tabs:
36 40
     #- acls-tab
37 41
     - settings-tab
38 42
     #- support-tab
39
-autorefresh: true
43
+    #- upgrade-top-tab
44
+    - vmgroup-tab
40 45
 features:
41 46
     # True to show showback monthly reports, and VM cost
42 47
     showback: true
@@ -49,6 +54,22 @@ features:
49 54
     # will be set to the same value as VCPU, that will still be visible for the
50 55
     # end users
51 56
     instantiate_hide_cpu: false
57
+
58
+    # False to not scale the CPU. Number [0, 1] to scale from VCPU
59
+    instantiate_cpu_factor: false
60
+
61
+    # True to show the option to make an instance persistent
62
+    instantiate_persistent: true
63
+
64
+    # True to show the datastore datatable to instantiate VM
65
+    show_ds_instantiate: false
66
+
67
+    # True to show the host datatable to instantiate VM
68
+    show_host_instantiate: false
69
+
70
+    # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
71
+    # deployed to
72
+    vcenter_vm_folder: false
52 73
 tabs:
53 74
     dashboard-tab:
54 75
         # The following widgets can be used inside any of the '_per_row' settings
@@ -85,20 +106,21 @@ tabs:
85 106
             user_groups_tab: true
86 107
             user_accounting_tab: true
87 108
             user_showback_tab: true
109
+            user_auth_tab: true
88 110
         table_columns:
89 111
             - 0         # Checkbox
90 112
             - 1         # ID
91 113
             - 2         # Name
92
-            #- 3         # Group
93
-            #- 4         # Auth driver
94
-            #- 5         # Password
114
+            #- 3        # Group
115
+            #- 4        # Auth driver
116
+            #- 5        # Password
95 117
             - 6         # VMs
96 118
             - 7         # Memory
97 119
             - 8         # CPU
98
-            #- 9         # Group ID
99
-            #- 10        # Hidden User Data
100
-            #- 11        # Labels
101
-            #- 12        # Search data
120
+            #- 9        # Group ID
121
+            #- 10       # Hidden User Data
122
+            #- 11       # Labels
123
+            #- 12       # Search data
102 124
         actions:
103 125
             User.refresh: true
104 126
             User.create_dialog: true
@@ -126,8 +148,7 @@ tabs:
126 148
             - 4         # VMs
127 149
             - 5         # Memory
128 150
             - 6         # CPU
129
-            #- 7         # Labels
130
-            #- 6         # Search data
151
+            #- 7        # Labels
131 152
         actions:
132 153
             Group.refresh: true
133 154
             Group.create_dialog: false
@@ -151,8 +172,7 @@ tabs:
151 172
             - 5         # Hosts
152 173
             - 6         # VNets
153 174
             - 7         # Datastores
154
-            #- 8         # Labels
155
-            #- 9         # Search data
175
+            #- 8        # Labels
156 176
         actions:
157 177
             Vdc.refresh: true
158 178
             Vdc.create_dialog: true
@@ -171,7 +191,7 @@ tabs:
171 191
             - 4         # Resource ID / Owned by
172 192
             - 5         # Allowed operations
173 193
             - 6         # Zone
174
-            #- 7         # ACL String
194
+            #- 7        # ACL String
175 195
         actions:
176 196
             Acl.refresh: true
177 197
             Acl.create_dialog: true
@@ -186,12 +206,12 @@ tabs:
186 206
         table_columns:
187 207
             - 0         # Checkbox
188 208
             - 1         # ID
189
-            - 2         # Owner
190
-            - 3         # Group
191
-            - 4         # Name
209
+            - 2         # Name
210
+            - 3         # Owner
211
+            - 4         # Group
192 212
             - 5         # Registration time
193
-            #- 6         # Labels
194
-            #- 7         # Search data
213
+            #- 6        # Labels
214
+            #- 7        # Search data
195 215
         actions:
196 216
             Template.refresh: true
197 217
             Template.create_dialog: false
@@ -216,8 +236,10 @@ tabs:
216 236
             features: true
217 237
             input_output: true
218 238
             context: true
239
+            actions: true
219 240
             scheduling: true
220 241
             hybrid: true
242
+            vmgroup: true
221 243
             other: true
222 244
 %if %%oneflow
223 245
     oneflow-templates-tab:
@@ -228,11 +250,11 @@ tabs:
228 250
         table_columns:
229 251
             - 0         # Checkbox
230 252
             - 1         # ID
231
-            - 2         # Owner
232
-            - 3         # Group
233
-            - 4         # Name
253
+            - 2         # Name
254
+            - 3         # Owner
255
+            - 4         # Group
234 256
             #- 5        # Labels
235
-            #- 6         # Search data
257
+            #- 6        # Search data
236 258
         actions:
237 259
             ServiceTemplate.refresh: true
238 260
             ServiceTemplate.create_dialog: false
@@ -254,12 +276,12 @@ tabs:
254 276
         table_columns:
255 277
             - 0         # Checkbox
256 278
             - 1         # ID
257
-            - 2         # Owner
258
-            - 3         # Group
259
-            - 4         # Name
279
+            - 2         # Name
280
+            - 3         # Owner
281
+            - 4         # Group
260 282
             - 5         # Registration time
261
-            #- 6         # Labels
262
-            #- 7         # Search data
283
+            #- 6        # Labels
284
+            #- 7        # Search data
263 285
         actions:
264 286
             VirtualRouterTemplate.refresh: true
265 287
             VirtualRouterTemplate.create_dialog: false
@@ -302,21 +324,21 @@ tabs:
302 324
             vm_template_tab: false
303 325
             vm_log_tab: false
304 326
         table_columns:
305
-            - 0       # Checkbox
306
-            - 1       # ID
307
-            - 2       # Owner
308
-            #- 3       # Group
309
-            - 4       # Name
310
-            - 5       # Status
327
+            - 0        # Checkbox
328
+            - 1        # ID
329
+            - 2        # Name
330
+            #- 3       # Owner
331
+            - 4        # Group
332
+            - 5        # Status
311 333
             #- 6       # Used CPU
312 334
             #- 7       # Used Memory
313 335
             #- 8       # Host
314
-            - 9       # IPs
336
+            - 9        # IPs
315 337
             #- 10      # Start Time
316
-            - 11      # VNC
338
+            - 11       # VNC
317 339
             #- 12      # Hidden Template
318 340
             #- 13      # Labels
319
-            #- 14         # Search data
341
+            #- 14      # Search data
320 342
         actions:
321 343
             VM.refresh: true
322 344
             VM.create_dialog: true
@@ -345,6 +367,7 @@ tabs:
345 367
             VM.attachdisk: false
346 368
             VM.detachdisk: false
347 369
             VM.disk_saveas: false
370
+            VM.disk_resize: false
348 371
             VM.attachnic: false
349 372
             VM.detachnic: false
350 373
             VM.snapshot_create: false
@@ -400,12 +423,12 @@ tabs:
400 423
         table_columns:
401 424
             - 0         # Checkbox
402 425
             - 1         # ID
403
-            - 2         # Owner
404
-            #- 3         # Group
405
-            - 4         # Name
426
+            - 2         # Name
427
+            #- 3        # Owner
428
+            - 4         # Group
406 429
             - 5         # State
407 430
             #- 6        # Labels
408
-            #- 7         # Search data
431
+            #- 7        # Search data
409 432
         actions:
410 433
             Service.refresh: true
411 434
             Service.create_dialog: true
@@ -419,6 +442,30 @@ tabs:
419 442
             Service.edit_labels: true
420 443
             Service.menu_labels: true
421 444
 %end if
445
+    vrouters-tab:
446
+        panel_tabs:
447
+            virtual_router_info_tab: true
448
+            virtual_router_vms_tab: true
449
+        table_columns:
450
+            - 0         # Checkbox
451
+            - 1         # ID
452
+            - 2         # Name
453
+            #- 3        # Owner
454
+            - 4         # Group
455
+            #- 5        # Labels
456
+            #- 6        # Search data
457
+        actions:
458
+            VirtualRouter.refresh: true
459
+            VirtualRouter.create_dialog: true
460
+            VirtualRouter.rename: true
461
+            VirtualRouter.chown: true
462
+            VirtualRouter.chgrp: false
463
+            VirtualRouter.chmod: false
464
+            VirtualRouter.delete: true
465
+            VirtualRouter.attachnic: false
466
+            VirtualRouter.detachnic: false
467
+            VirtualRouter.edit_labels: true
468
+            VirtualRouter.menu_labels: true
422 469
     infrastructure-top-tab:
423 470
         panel_tabs:
424 471
         actions:
@@ -435,7 +482,7 @@ tabs:
435 482
             - 3         # Hosts
436 483
             - 4         # VNets
437 484
             - 5         # Datastores
438
-            #- 6         # Labels
485
+            #- 6        # Labels
439 486
         actions:
440 487
             Cluster.refresh: true
441 488
             Cluster.create_dialog: true
@@ -459,16 +506,16 @@ tabs:
459 506
             - 2         # Name
460 507
             - 3         # Cluster
461 508
             - 4         # RVMs
462
-            #- 5         # Real CPU
509
+            #- 5        # Real CPU
463 510
             - 6         # Allocated CPU
464
-            #- 7         # Real MEM
511
+            #- 7        # Real MEM
465 512
             - 8         # Allocated MEM
466 513
             - 9         # Status
467
-            #- 10        # IM MAD
468
-            #- 11        # VM MAD
469
-            #- 12        # Last monitored on
470
-            #- 13        # Labels
471
-            #- 14         # Search data
514
+            #- 10       # IM MAD
515
+            #- 11       # VM MAD
516
+            #- 12       # Last monitored on
517
+            #- 13       # Labels
518
+            #- 14       # Search data
472 519
         actions:
473 520
             Host.refresh: true
474 521
             Host.create_dialog: true
@@ -488,7 +535,7 @@ tabs:
488 535
             - 1         # ID
489 536
             - 2         # Name
490 537
             - 3         # Endpoint
491
-            #- 4         # Labels
538
+            #- 4        # Labels
492 539
         actions:
493 540
             Zone.refresh: true
494 541
             Zone.create_dialog: true
@@ -507,18 +554,18 @@ tabs:
507 554
         table_columns:
508 555
             - 0         # Checkbox
509 556
             - 1         # ID
510
-            - 2         # Owner
511
-            - 3         # Group
512
-            - 4         # Name
557
+            - 2         # Name
558
+            - 3         # Owner
559
+            - 4         # Group
513 560
             - 5         # Capacity
514 561
             - 6         # Cluster
515
-            #- 7         # Basepath
516
-            #- 8         # TM
517
-            #- 9         # DS
562
+            #- 7        # Basepath
563
+            #- 8        # TM
564
+            #- 9        # DS
518 565
             - 10        # Type
519 566
             - 11        # Status
520
-            #- 12        # Labels
521
-            #- 13         # Search data
567
+            #- 12       # Labels
568
+            #- 13       # Search data
522 569
         actions:
523 570
             Datastore.refresh: true
524 571
             Datastore.create_dialog: true
@@ -541,19 +588,19 @@ tabs:
541 588
         table_columns:
542 589
             - 0         # Checkbox
543 590
             - 1         # ID
544
-            - 2         # Owner
545
-            - 3         # Group
546
-            - 4         # Name
591
+            - 2         # Name
592
+            - 3         # Owner
593
+            - 4         # Group
547 594
             - 5         # Datastore
548
-            #- 6         # Size
549
-            - 7        # Type
550
-            #- 8         # Registration time
595
+            #- 6        # Size
596
+            - 7         # Type
597
+            #- 8        # Registration time
551 598
             #- 9        # Persistent
552 599
             - 10        # Status
553 600
             - 11        # #VMs
554 601
             #- 12       # Target
555 602
             #- 13       # Labels
556
-            #- 14         # Search data
603
+            #- 14       # Search data
557 604
         actions:
558 605
             Image.refresh: true
559 606
             Image.create_dialog: true
@@ -580,19 +627,19 @@ tabs:
580 627
         table_columns:
581 628
             - 0         # Checkbox
582 629
             - 1         # ID
583
-            - 2         # Owner
584
-            - 3         # Group
585
-            - 4         # Name
630
+            - 2         # Name
631
+            - 3         # Owner
632
+            - 4         # Group
586 633
             - 5         # Datastore
587
-            #- 6         # Size
588
-            - 7        # Type
589
-            #- 8         # Registration time
634
+            #- 6        # Size
635
+            - 7         # Type
636
+            #- 8        # Registration time
590 637
             #- 9        # Persistent
591 638
             - 10        # Status
592
-            #- 11        # #VMs
639
+            #- 11       # #VMs
593 640
             #- 12       # Target
594 641
             #- 13       # Labels
595
-            #- 14         # Search data
642
+            #- 14       # Search data
596 643
         actions:
597 644
             File.refresh: true
598 645
             File.create_dialog: true
@@ -612,15 +659,15 @@ tabs:
612 659
         table_columns:
613 660
             - 0         # Checkbox
614 661
             - 1         # ID
615
-            - 2         # Owner
616
-            - 3         # Group
617
-            - 4         # Name
662
+            - 2         # Name
663
+            - 3         # Owner
664
+            - 4         # Group
618 665
             - 5         # Capacity
619 666
             - 6         # Apps
620 667
             - 7         # Driver
621 668
             - 8         # Zone
622 669
             #- 9        # Labels
623
-            #- 10         # Search data
670
+            #- 10       # Search data
624 671
         actions:
625 672
             MarketPlace.refresh: true
626 673
             MarketPlace.create_dialog: true
@@ -639,18 +686,18 @@ tabs:
639 686
         table_columns:
640 687
             - 0         # Checkbox
641 688
             - 1         # ID
642
-            - 2         # Owner
643
-            - 3         # Group
644
-            - 4         # Name
645
-            #- 5         # Version
689
+            - 2         # Name
690
+            - 3         # Owner
691
+            - 4         # Group
692
+            #- 5        # Version
646 693
             - 6         # Size
647 694
             - 7         # State
648
-            #- 8         # Type
695
+            #- 8        # Type
649 696
             - 9         # Registration
650 697
             - 10        # Marketplace
651
-            - 11         # Zone
652
-            #- 12        # Labels
653
-            #- 13         # Search data
698
+            - 11        # Zone
699
+            #- 12       # Labels
700
+            #- 13       # Search data
654 701
         actions:
655 702
             MarketPlaceApp.refresh: true
656 703
             MarketPlaceApp.create_dialog: true
@@ -679,16 +726,16 @@ tabs:
679 726
         table_columns:
680 727
             - 0         # Checkbox
681 728
             - 1         # ID
682
-            #- 2         # Owner
683
-            #- 3         # Group
684
-            - 4         # Name
685
-            #- 5         # Reservation
686
-            #- 6         # Cluster
687
-            #- 7         # Bridge
688
-            #- 8         # Leases
689
-            #- 9         # VLAN ID
690
-            #- 10         # Labels
691
-            #- 11         # Search data
729
+            #- 2        # Name
730
+            #- 3        # Owner
731
+            - 4         # Group
732
+            #- 5        # Reservation
733
+            #- 6        # Cluster
734
+            #- 7        # Bridge
735
+            #- 8        # Leases
736
+            #- 9        # VLAN ID
737
+            #- 10       # Labels
738
+            #- 11       # Search data
692 739
         actions:
693 740
             Network.refresh: true
694 741
             Network.create_dialog: false
@@ -708,30 +755,6 @@ tabs:
708 755
             Network.update_ar: false
709 756
             Network.edit_labels: true
710 757
             Network.menu_labels: true
711
-    vrouters-tab:
712
-        panel_tabs:
713
-            virtual_router_info_tab: true
714
-            virtual_router_vms_tab: true
715
-        table_columns:
716
-            - 0         # Checkbox
717
-            - 1         # ID
718
-            - 2         # Owner
719
-            #- 3         # Group
720
-            - 4         # Name
721
-            #- 5        # Labels
722
-            #- 6         # Search data
723
-        actions:
724
-            VirtualRouter.refresh: true
725
-            VirtualRouter.create_dialog: true
726
-            VirtualRouter.rename: true
727
-            VirtualRouter.chown: true
728
-            VirtualRouter.chgrp: false
729
-            VirtualRouter.chmod: false
730
-            VirtualRouter.delete: true
731
-            VirtualRouter.attachnic: false
732
-            VirtualRouter.detachnic: false
733
-            VirtualRouter.edit_labels: true
734
-            VirtualRouter.menu_labels: true
735 758
     vnets-topology-tab:
736 759
         panel_tabs:
737 760
         actions:
@@ -746,11 +769,11 @@ tabs:
746 769
         table_columns:
747 770
             - 0         # Checkbox
748 771
             - 1         # ID
749
-            #- 2         # Owner
750
-            #- 3         # Group
751
-            - 4         # Name
752
-            #- 5         # Labels
753
-            #- 6         # Search data
772
+            #- 2        # Name
773
+            #- 3        # Owner
774
+            - 4         # Group
775
+            #- 5        # Labels
776
+            #- 6        # Search data
754 777
         actions:
755 778
             SecurityGroup.refresh: true
756 779
             SecurityGroup.create_dialog: false
@@ -768,7 +791,7 @@ tabs:
768 791
         panel_tabs:
769 792
             support_info_tab: true
770 793
         table_columns:
771
-            #- 0         # Checkbox
794
+            #- 0        # Checkbox
772 795
             - 1         # ID
773 796
             - 2         # Subject
774 797
             - 3         # Created at
@@ -778,22 +801,44 @@ tabs:
778 801
             Support.create_dialog: true
779 802
     settings-tab:
780 803
         panel_tabs:
781
-            user_info_tab: true
782
-            user_config_tab: false
783
-            user_quotas_tab: true
784
-            group_quotas_tab: true
785
-            user_accounting_tab: true
786
-            user_showback_tab: true
804
+            settings_info_tab: true
805
+            settings_config_tab: false
806
+            settings_quotas_tab: true
807
+            settings_group_quotas_tab: true
808
+            settings_accounting_tab: true
809
+            settings_showback_tab: true
810
+            settings_auth_tab: true
787 811
         actions:
788
-            # The buttons inside the settings-tab panel user_info_tab are
789
-            # configured with users-tab/actions; User.update_password and
790
-            # User.login_token
791
-            #
792
-            # Buttons for user_config_tab
812
+            # Buttons for settings_info_tab
813
+            User.update_password: true
814
+            User.login_token: true
815
+            # Buttons for settings_config_tab
793 816
             Settings.change_language: true
794 817
             Settings.change_password: true
795 818
             Settings.change_view: true
796 819
             Settings.ssh_key: true
797 820
             Settings.login_token: true
798
-            # Edit button in user_quotas_tab
799
-            User.quotas_dialog: false
821
+            # Edit button in settings_quotas_tab
822
+            User.quotas_dialog: false
823
+    upgrade-top-tab:
824
+        panel_tabs:
825
+        actions:
826
+    vmgroup-tab:
827
+        panel_tabs:
828
+            vm_group_info_tab: true
829
+            vm_group_vms_tab: true
830
+        table_columns:
831
+            - 0         # Checkbox
832
+            - 1         # ID
833
+            - 2         # Name
834
+            - 3         # Owner
835
+            - 4         # Group
836
+            - 5         # Vms
837
+            #- 6        # Labels
838
+            #- 7        # Search data
839
+        actions:
840
+           VMGroup.create_dialog: true
841
+           VMGroup.update_dialog: true
842
+           VMGroup.chmod: true
843
+           VMGroup.chown: true
844
+           VMGroup.chgrp: true

+ 198
- 121
tmpl/groupadmin_vcenter.yaml View File

@@ -1,6 +1,10 @@
1 1
 %set oneflow = %%getVar('activer_oneflow','non') == 'oui'
2 2
 small_logo: images/opennebula-5.0.png
3 3
 provision_logo: images/opennebula-5.0.png
4
+link_logo:
5
+text_link_logo:
6
+confirm_vms: false
7
+filter-view: true
4 8
 enabled_tabs:
5 9
     - dashboard-tab
6 10
     - instances-top-tab
@@ -15,10 +19,6 @@ enabled_tabs:
15 19
     - oneflow-templates-tab
16 20
 %end if
17 21
     #- vrouter-templates-tab
18
-    #- infrastructure-top-tab
19
-    #- clusters-tab
20
-    #- hosts-tab
21
-    #- zones-tab
22 22
     #- storage-top-tab
23 23
     #- datastores-tab
24 24
     #- images-tab
@@ -29,6 +29,10 @@ enabled_tabs:
29 29
     - vnets-tab
30 30
     - vnets-topology-tab
31 31
     #- secgroups-tab
32
+    #- infrastructure-top-tab
33
+    #- clusters-tab
34
+    #- hosts-tab
35
+    #- zones-tab
32 36
     - system-top-tab
33 37
     - users-tab
34 38
     - groups-tab
@@ -36,7 +40,8 @@ enabled_tabs:
36 40
     #- acls-tab
37 41
     - settings-tab
38 42
     #- support-tab
39
-autorefresh: true
43
+    #- upgrade-top-tab
44
+    - vmgroup-tab
40 45
 features:
41 46
     # True to show showback monthly reports, and VM cost
42 47
     showback: true
@@ -44,6 +49,21 @@ features:
44 49
     # Allows to change the security groups for each network interface
45 50
     # on the VM creation dialog
46 51
     secgroups: false
52
+
53
+    # True to hide the CPU setting in the VM creation dialog. The CPU setting
54
+    # will be set to the same value as VCPU, that will still be visible for the
55
+    # end users
56
+    instantiate_hide_cpu: true
57
+
58
+    # False to not scale the CPU. Number [0, 1] to scale from VCPU
59
+    instantiate_cpu_factor: false
60
+
61
+    # True to show the option to make an instance persistent
62
+    instantiate_persistent: true
63
+
64
+    # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will
65
+    # deployed to
66
+    vcenter_vm_folder: false
47 67
 tabs:
48 68
     dashboard-tab:
49 69
         # The following widgets can be used inside any of the '_per_row' settings
@@ -80,27 +100,29 @@ tabs:
80 100
             user_groups_tab: true
81 101
             user_accounting_tab: true
82 102
             user_showback_tab: true
103
+            user_auth_tab: true
83 104
         table_columns:
84 105
             - 0         # Checkbox
85 106
             - 1         # ID
86 107
             - 2         # Name
87
-            #- 3         # Group
88
-            #- 4         # Auth driver
89
-            - 5         # VMs
90
-            - 6         # Memory
91
-            - 7         # CPU
92
-            #- 8         # Group ID
93
-            #- 9         # Hidden User Data
94
-            #- 10        # Labels
108
+            #- 3        # Group
109
+            #- 4        # Auth driver
110
+            #- 5        # Password
111
+            - 6         # VMs
112
+            - 7         # Memory
113
+            - 8         # CPU
114
+            #- 9        # Group ID
115
+            #- 10       # Hidden User Data
116
+            #- 11       # Labels
117
+            #- 12       # Search data
95 118
         actions:
96 119
             User.refresh: true
97 120
             User.create_dialog: true
98 121
             User.update_password: true
122
+            User.login_token: true
99 123
             User.quotas_dialog: true
100 124
             User.groups_dialog: false
101 125
             User.chgrp: false
102
-            User.addgroup: false
103
-            User.delgroup: false
104 126
             User.change_authentication: false
105 127
             User.delete: true
106 128
             User.edit_labels: true
@@ -120,7 +142,7 @@ tabs:
120 142
             - 4         # VMs
121 143
             - 5         # Memory
122 144
             - 6         # CPU
123
-            #- 7         # Labels
145
+            #- 7        # Labels
124 146
         actions:
125 147
             Group.refresh: true
126 148
             Group.create_dialog: false
@@ -144,7 +166,7 @@ tabs:
144 166
             - 5         # Hosts
145 167
             - 6         # VNets
146 168
             - 7         # Datastores
147
-            #- 8         # Labels
169
+            #- 8        # Labels
148 170
         actions:
149 171
             Vdc.refresh: true
150 172
             Vdc.create_dialog: true
@@ -163,7 +185,7 @@ tabs:
163 185
             - 4         # Resource ID / Owned by
164 186
             - 5         # Allowed operations
165 187
             - 6         # Zone
166
-            #- 7         # ACL String
188
+            #- 7        # ACL String
167 189
         actions:
168 190
             Acl.refresh: true
169 191
             Acl.create_dialog: true
@@ -178,11 +200,12 @@ tabs:
178 200
         table_columns:
179 201
             - 0         # Checkbox
180 202
             - 1         # ID
181
-            - 2         # Owner
182
-            - 3         # Group
183
-            - 4         # Name
203
+            - 2         # Name
204
+            - 3         # Owner
205
+            - 4         # Group
184 206
             - 5         # Registration time
185
-            #- 6         # Labels
207
+            #- 6        # Labels
208
+            #- 7        # Search data
186 209
         actions:
187 210
             Template.refresh: true
188 211
             Template.create_dialog: false
@@ -207,8 +230,10 @@ tabs:
207 230
             features: true
208 231
             input_output: true
209 232
             context: true
233
+            actions: true
210 234
             scheduling: true
211 235
             hybrid: true
236
+            vmgroup: true
212 237
             other: true
213 238
 %if %%oneflow
214 239
     oneflow-templates-tab:
@@ -219,10 +244,11 @@ tabs:
219 244
         table_columns:
220 245
             - 0         # Checkbox
221 246
             - 1         # ID
222
-            - 2         # Owner
223
-            - 3         # Group
224
-            - 4         # Name
247
+            - 2         # Name
248
+            - 3         # Owner
249
+            - 4         # Group
225 250
             #- 5        # Labels
251
+            #- 6        # Search data
226 252
         actions:
227 253
             ServiceTemplate.refresh: true
228 254
             ServiceTemplate.create_dialog: false
@@ -244,15 +270,17 @@ tabs:
244 270
         table_columns:
245 271
             - 0         # Checkbox
246 272
             - 1         # ID
247
-            - 2         # Owner
248
-            - 3         # Group
249
-            - 4         # Name
273
+            - 2         # Name
274
+            - 3         # Owner
275
+            - 4         # Group
250 276
             - 5         # Registration time
251
-            #- 6         # Labels
277
+            #- 6        # Labels
278
+            #- 7        # Search data
252 279
         actions:
253 280
             VirtualRouterTemplate.refresh: true
254 281
             VirtualRouterTemplate.create_dialog: false
255 282
             VirtualRouterTemplate.update_dialog: false
283
+            VirtualRouterTemplate.instantiate_dialog: false
256 284
             VirtualRouterTemplate.rename: true
257 285
             VirtualRouterTemplate.chown: true
258 286
             VirtualRouterTemplate.chgrp: false
@@ -292,18 +320,19 @@ tabs:
292 320
         table_columns:
293 321
             - 0       # Checkbox
294 322
             - 1       # ID
295
-            - 2       # Owner
296
-            #- 3       # Group
297
-            - 4       # Name
323
+            - 2       # Name
324
+            #- 3      # Owner
325
+            - 4       # Group
298 326
             - 5       # Status
299
-            #- 6       # Used CPU
300
-            #- 7       # Used Memory
301
-            #- 8       # Host
327
+            #- 6      # Used CPU
328
+            #- 7      # Used Memory
329
+            #- 8      # Host
302 330
             - 9       # IPs
303
-            #- 10      # Start Time
331
+            #- 10     # Start Time
304 332
             - 11      # VNC
305
-            #- 12      # Hidden Template
306
-            #- 13      # Labels
333
+            #- 12     # Hidden Template
334
+            #- 13     # Labels
335
+            #- 14     # Search data
307 336
         actions:
308 337
             VM.refresh: true
309 338
             VM.create_dialog: true
@@ -332,6 +361,7 @@ tabs:
332 361
             VM.attachdisk: false
333 362
             VM.detachdisk: false
334 363
             VM.disk_saveas: false
364
+            VM.disk_resize: false
335 365
             VM.attachnic: false
336 366
             VM.detachnic: false
337 367
             VM.snapshot_create: false
@@ -387,13 +417,15 @@ tabs:
387 417
         table_columns:
388 418
             - 0         # Checkbox
389 419
             - 1         # ID
390
-            - 2         # Owner
391
-            #- 3         # Group
392
-            - 4         # Name
420
+            - 2         # Name
421
+            #- 3        # Owner
422
+            - 4         # Group
393 423
             - 5         # State
394 424
             #- 6        # Labels
425
+            #- 7        # Search data
395 426
         actions:
396 427
             Service.refresh: true
428
+            Service.create_dialog: true
397 429
             Service.chown: true
398 430
             Service.chgrp: false
399 431
             Service.chmod: false
@@ -404,6 +436,30 @@ tabs:
404 436
             Service.edit_labels: true
405 437
             Service.menu_labels: true
406 438
 %end if
439
+    vrouters-tab:
440
+        panel_tabs:
441
+            virtual_router_info_tab: true
442
+            virtual_router_vms_tab: true
443
+        table_columns:
444
+            - 0         # Checkbox
445
+            - 1         # ID
446
+            - 2         # Name
447
+            #- 3        # Owner
448
+            - 4         # Group
449
+            #- 5        # Labels
450
+            #- 6        # Search data
451
+        actions:
452
+            VirtualRouter.refresh: true
453
+            VirtualRouter.create_dialog: true
454
+            VirtualRouter.rename: true
455
+            VirtualRouter.chown: true
456
+            VirtualRouter.chgrp: false
457
+            VirtualRouter.chmod: false
458
+            VirtualRouter.delete: true
459
+            VirtualRouter.attachnic: false
460
+            VirtualRouter.detachnic: false
461
+            VirtualRouter.edit_labels: true
462
+            VirtualRouter.menu_labels: true
407 463
     infrastructure-top-tab:
408 464
         panel_tabs:
409 465
         actions:
@@ -420,7 +476,7 @@ tabs:
420 476
             - 3         # Hosts
421 477
             - 4         # VNets
422 478
             - 5         # Datastores
423
-            #- 6         # Labels
479
+            #- 6        # Labels
424 480
         actions:
425 481
             Cluster.refresh: true
426 482
             Cluster.create_dialog: true
@@ -444,15 +500,16 @@ tabs:
444 500
             - 2         # Name
445 501
             - 3         # Cluster
446 502
             - 4         # RVMs
447
-            #- 5         # Real CPU
503
+            #- 5        # Real CPU
448 504
             - 6         # Allocated CPU
449
-            #- 7         # Real MEM
505
+            #- 7        # Real MEM
450 506
             - 8         # Allocated MEM
451 507
             - 9         # Status
452
-            #- 10        # IM MAD
453
-            #- 11        # VM MAD
454
-            #- 12        # Last monitored on
455
-            #- 13        # Labels
508
+            #- 10       # IM MAD
509
+            #- 11       # VM MAD
510
+            #- 12       # Last monitored on
511
+            #- 13       # Labels
512
+            #- 14       # Search data
456 513
         actions:
457 514
             Host.refresh: true
458 515
             Host.create_dialog: true
@@ -472,7 +529,7 @@ tabs:
472 529
             - 1         # ID
473 530
             - 2         # Name
474 531
             - 3         # Endpoint
475
-            #- 4         # Labels
532
+            #- 4        # Labels
476 533
         actions:
477 534
             Zone.refresh: true
478 535
             Zone.create_dialog: true
@@ -491,20 +548,22 @@ tabs:
491 548
         table_columns:
492 549
             - 0         # Checkbox
493 550
             - 1         # ID
494
-            - 2         # Owner
495
-            - 3         # Group
496
-            - 4         # Name
551
+            - 2         # Name
552
+            - 3         # Owner
553
+            - 4         # Group
497 554
             - 5         # Capacity
498 555
             - 6         # Cluster
499
-            #- 7         # Basepath
500
-            #- 8         # TM
501
-            #- 9         # DS
556
+            #- 7        # Basepath
557
+            #- 8        # TM
558
+            #- 9        # DS
502 559
             - 10        # Type
503 560
             - 11        # Status
504
-            #- 12        # Labels
561
+            #- 12       # Labels
562
+            #- 13       # Search data
505 563
         actions:
506 564
             Datastore.refresh: true
507 565
             Datastore.create_dialog: true
566
+            Datastore.import_dialog: false
508 567
             Datastore.addtocluster: true
509 568
             Datastore.rename: true
510 569
             Datastore.chown: true
@@ -523,23 +582,24 @@ tabs:
523 582
         table_columns:
524 583
             - 0         # Checkbox
525 584
             - 1         # ID
526
-            - 2         # Owner
527
-            - 3         # Group
528
-            - 4         # Name
585
+            - 2         # Name
586
+            - 3         # Owner
587
+            - 4         # Group
529 588
             - 5         # Datastore
530
-            #- 6         # Size
531
-            - 7        # Type
532
-            #- 8         # Registration time
589
+            #- 6        # Size
590
+            - 7         # Type
591
+            #- 8        # Registration time
533 592
             #- 9        # Persistent
534 593
             - 10        # Status
535 594
             - 11        # #VMs
536 595
             #- 12       # Target
537 596
             #- 13       # Labels
597
+            #- 14       # Search data
538 598
         actions:
539 599
             Image.refresh: true
540 600
             Image.create_dialog: true
541
-            Image.upload_marketplace_dialog: false
542 601
             Image.import_dialog: true
602
+            Image.upload_marketplace_dialog: false
543 603
             Image.rename: true
544 604
             Image.chown: true
545 605
             Image.chgrp: true
@@ -561,18 +621,19 @@ tabs:
561 621
         table_columns:
562 622
             - 0         # Checkbox
563 623
             - 1         # ID
564
-            - 2         # Owner
565
-            - 3         # Group
566
-            - 4         # Name
624
+            - 2         # Name
625
+            - 3         # Owner
626
+            - 4         # Group
567 627
             - 5         # Datastore
568
-            #- 6         # Size
569
-            - 7        # Type
570
-            #- 8         # Registration time
628
+            #- 6        # Size
629
+            - 7         # Type
630
+            #- 8        # Registration time
571 631
             #- 9        # Persistent
572 632
             - 10        # Status
573
-            #- 11        # #VMs
633
+            #- 11       # #VMs
574 634
             #- 12       # Target
575 635
             #- 13       # Labels
636
+            #- 14       # Search data
576 637
         actions:
577 638
             File.refresh: true
578 639
             File.create_dialog: true
@@ -592,14 +653,15 @@ tabs:
592 653
         table_columns:
593 654
             - 0         # Checkbox
594 655
             - 1         # ID
595
-            - 2         # Owner
596
-            - 3         # Group
597
-            - 4         # Name
656
+            - 2         # Name
657
+            - 3         # Owner
658
+            - 4         # Group
598 659
             - 5         # Capacity
599 660
             - 6         # Apps
600 661
             - 7         # Driver
601 662
             - 8         # Zone
602 663
             #- 9        # Labels
664
+            #- 10       # Search data
603 665
         actions:
604 666
             MarketPlace.refresh: true
605 667
             MarketPlace.create_dialog: true
@@ -618,17 +680,18 @@ tabs:
618 680
         table_columns:
619 681
             - 0         # Checkbox
620 682
             - 1         # ID
621
-            - 2         # Owner
622
-            - 3         # Group
623
-            - 4         # Name
624
-            #- 5         # Version
683
+            - 2         # Name
684
+            - 3         # Owner
685
+            - 4         # Group
686
+            #- 5        # Version
625 687
             - 6         # Size
626 688
             - 7         # State
627
-            #- 8         # Type
689
+            #- 8        # Type
628 690
             - 9         # Registration
629 691
             - 10        # Marketplace
630
-            - 11         # Zone
631
-            #- 12        # Labels
692
+            - 11        # Zone
693
+            #- 12       # Labels
694
+            #- 13       # Search data
632 695
         actions:
633 696
             MarketPlaceApp.refresh: true
634 697
             MarketPlaceApp.create_dialog: true
@@ -657,15 +720,16 @@ tabs:
657 720
         table_columns:
658 721
             - 0         # Checkbox
659 722
             - 1         # ID
660
-            #- 2         # Owner
661
-            #- 3         # Group
662
-            - 4         # Name
663
-            #- 5         # Reservation
664
-            #- 6         # Cluster
665
-            #- 7         # Bridge
666
-            #- 8         # Leases
667
-            #- 9         # VLAN ID
668
-            #- 10         # Labels
723
+            #- 2        # Name
724
+            #- 3        # Owner
725
+            - 4         # Group
726
+            #- 5        # Reservation
727
+            #- 6        # Cluster
728
+            #- 7        # Bridge
729
+            #- 8        # Leases
730
+            #- 9        # VLAN ID
731
+            #- 10       # Labels
732
+            #- 11       # Search data
669 733
         actions:
670 734
             Network.refresh: true
671 735
             Network.create_dialog: false
@@ -685,28 +749,6 @@ tabs:
685 749
             Network.update_ar: false
686 750
             Network.edit_labels: true
687 751
             Network.menu_labels: true
688
-    vrouters-tab:
689
-        panel_tabs:
690
-            virtual_router_info_tab: true
691
-            virtual_router_vms_tab: true
692
-        table_columns:
693
-            - 0         # Checkbox
694
-            - 1         # ID
695
-            - 2         # Owner
696
-            #- 3         # Group
697
-            - 4         # Name
698
-        actions:
699
-            VirtualRouter.refresh: true
700
-            VirtualRouter.create_dialog: true
701
-            VirtualRouter.rename: true
702
-            VirtualRouter.chown: true
703
-            VirtualRouter.chgrp: false
704
-            VirtualRouter.chmod: false
705
-            VirtualRouter.delete: true
706
-            VirtualRouter.attachnic: false
707
-            VirtualRouter.detachnic: false
708
-            VirtualRouter.edit_labels: true
709
-            VirtualRouter.menu_labels: true
710 752
     vnets-topology-tab:
711 753
         panel_tabs:
712 754
         actions:
@@ -721,10 +763,11 @@ tabs:
721 763
         table_columns:
722 764
             - 0         # Checkbox
723 765
             - 1         # ID
724
-            #- 2         # Owner
725
-            #- 3         # Group
726
-            - 4         # Name
727
-            #- 5         # Labels
766
+            #- 2        # Name
767
+            #- 3        # Owner
768
+            - 4         # Group
769
+            #- 5        # Labels
770
+            #- 6        # Search data
728 771
         actions:
729 772
             SecurityGroup.refresh: true
730 773
             SecurityGroup.create_dialog: false
@@ -742,7 +785,7 @@ tabs:
742 785
         panel_tabs:
743 786
             support_info_tab: true
744 787
         table_columns:
745
-            #- 0         # Checkbox
788
+            #- 0        # Checkbox
746 789
             - 1         # ID
747 790
             - 2         # Subject
748 791
             - 3         # Created at
@@ -752,10 +795,44 @@ tabs:
752 795
             Support.create_dialog: true
753 796
     settings-tab:
754 797
         panel_tabs:
755
-            user_info_tab: true
756
-            user_quotas_tab: true
757
-            group_quotas_tab: true
758
-            user_accounting_tab: true
759
-            user_showback_tab: true
798
+            settings_info_tab: true
799
+            settings_config_tab: false
800
+            settings_quotas_tab: true
801
+            settings_group_quotas_tab: true
802
+            settings_accounting_tab: true
803
+            settings_showback_tab: true
804
+            settings_auth_tab: true
760 805
         actions:
806
+            # Buttons for settings_info_tab
807
+            User.update_password: true
808
+            User.login_token: true
809
+            # Buttons for settings_config_tab
810
+            Settings.change_language: true
811
+            Settings.change_password: true
812
+            Settings.change_view: true
813
+            Settings.ssh_key: true
814
+            Settings.login_token: true
815
+            # Edit button in settings_quotas_tab
761 816
             User.quotas_dialog: false
817
+    upgrade-top-tab:
818
+        panel_tabs:
819
+        actions:
820
+    vmgroup-tab:
821
+        panel_tabs:
822
+            vm_group_info_tab: true
823
+            vm_group_vms_tab: true
824
+        table_columns:
825
+            - 0         # Checkbox
826
+            - 1         # ID
827
+            - 2         # Name
828
+            - 3         # Owner
829
+            - 4         # Group
830
+            - 5         # Vms
831
+            #- 6        # Labels
832
+            #- 7        # Search data
833
+        actions:
834
+           VMGroup.create_dialog: true
835
+           VMGroup.update_dialog: true
836
+           VMGroup.chmod: true
837
+           VMGroup.chown: true
838
+           VMGroup.chgrp: true

+ 0
- 39
tmpl/sunstone-ldap_auth.conf View File

@@ -1,39 +0,0 @@
1
-%if %%getVar('sunstone_auth_modes', None) == 'ldap'
2
-server 1:
3
-    # Ldap user able to query, if not set connects as anonymous. For
4
-    # Active Directory append the domain name. Example:
5
-    # Administrator@my.domain.com
6
-    #:user: 'admin'
7
-    #:password: 'password'
8
-
9
-    # Ldap authentication method
10
-    :auth_method: :simple
11
-
12
-    # Ldap server
13
-    :host: %%adresse_ip_ldap
14
-    :port: %%ldap_port
15
-%if %%getVar('ldap_tls', 'non') == 'oui'
16
-
17
-    # Uncomment this line for tls conections
18
-    :encryption: :simple_tls
19
-%end if
20
-
21
-    # base hierarchy where to search for users and groups
22
-    :base: %%ldap_base_dn
23
-
24
-    # group the users need to belong to. If not set any user will do
25
-    #:group: 'cn=cloud,ou=groups,dc=domain'
26
-
27
-    # field that holds the user name, if not set 'cn' will be used
28
-    :user_field: 'uid'
29
-
30
-    # for Active Directory use this user_field instead
31
-    #:user_field: 'sAMAccountName'
32
-
33
-    # Default group ID used for users in an AD group not mapped
34
-    :mapping_default: 1
35
-
36
-# List the order the servers are queried
37
-:order: