From 609c60d21f6d506ab5e7fc0c303865b118dfe715 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Thu, 19 Oct 2017 11:42:07 +0200 Subject: [PATCH] Update Sunstone configuration files for 5.4.1 Ref: #21703 --- dicos/99_one-frontend.xml | 3 +- tmpl/admin.yaml | 245 +++++++++++++++----------- tmpl/admin_vcenter.yaml | 300 ++++++++++++++++++-------------- tmpl/cloud.yaml | 109 ++++++++---- tmpl/cloud_vcenter.yaml | 157 +++++++++++++++++ tmpl/groupadmin.yaml | 327 ++++++++++++++++++++--------------- tmpl/groupadmin_vcenter.yaml | 319 +++++++++++++++++++++------------- tmpl/sunstone-ldap_auth.conf | 39 ----- tmpl/sunstone-logos.yaml | 11 ++ tmpl/sunstone-server.conf | 20 ++- tmpl/user.yaml | 69 ++++++-- 11 files changed, 1011 insertions(+), 588 deletions(-) create mode 100644 tmpl/cloud_vcenter.yaml delete mode 100644 tmpl/sunstone-ldap_auth.conf create mode 100644 tmpl/sunstone-logos.yaml diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml index 8910517..dd2fa74 100644 --- a/dicos/99_one-frontend.xml +++ b/dicos/99_one-frontend.xml @@ -3,13 +3,14 @@ opennebula-sunstone + + - diff --git a/tmpl/admin.yaml b/tmpl/admin.yaml index 981f8a1..c815420 100644 --- a/tmpl/admin.yaml +++ b/tmpl/admin.yaml @@ -1,6 +1,10 @@ %set oneflow = %%getVar('activer_oneflow','non') == 'oui' small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false +filter-view: true enabled_tabs: - dashboard-tab - instances-top-tab @@ -37,7 +41,7 @@ enabled_tabs: - settings-tab - support-tab - upgrade-top-tab -autorefresh: true + - vmgroup-tab features: # True to show showback monthly reports, and VM cost showback: true @@ -50,6 +54,22 @@ features: # will be set to the same value as VCPU, that will still be visible for the # end users instantiate_hide_cpu: false + + # False to not scale the CPU. Number [0, 1] to scale from VCPU + instantiate_cpu_factor: false + + # True to show the option to make an instance persistent + instantiate_persistent: true + + # True to show the datastore datatable to instantiate VM + show_ds_instantiate: true + + # True to show the host datatable to instantiate VM + show_host_instantiate: true + + # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will + # deployed to + vcenter_vm_folder: false tabs: dashboard-tab: # The following widgets can be used inside any of the '_per_row' settings @@ -87,20 +107,21 @@ tabs: user_groups_tab: true user_accounting_tab: true user_showback_tab: true + user_auth_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Name - 3 # Group - 4 # Auth driver - #- 5 # Password + #- 5 # Password - 6 # VMs - 7 # Memory - 8 # CPU - #- 9 # Group ID - #- 10 # Hidden User Data - #- 11 # Labels - #- 12 # Search data + #- 9 # Group ID + #- 10 # Hidden User Data + #- 11 # Labels + #- 12 # Search data actions: User.refresh: true User.create_dialog: true @@ -152,7 +173,7 @@ tabs: - 5 # Hosts - 6 # VNets - 7 # Datastores - #- 8 # Labels + #- 8 # Labels actions: Vdc.refresh: true Vdc.create_dialog: true @@ -171,7 +192,7 @@ tabs: - 4 # Resource ID / Owned by - 5 # Allowed operations - 6 # Zone - #- 7 # ACL String + #- 7 # ACL String actions: Acl.refresh: true Acl.create_dialog: true @@ -186,12 +207,12 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels - #- 7 # Search data + #- 6 # Labels + #- 7 # Search data actions: Template.refresh: true Template.create_dialog: true @@ -216,8 +237,10 @@ tabs: features: true input_output: true context: true + actions: true scheduling: true hybrid: true + vmgroup: true other: true %if %%oneflow oneflow-templates-tab: @@ -228,9 +251,9 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group #- 5 # Labels #- 6 # Search data actions: @@ -254,12 +277,12 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels - #- 7 # Search data + #- 6 # Labels + #- 7 # Search data actions: VirtualRouterTemplate.refresh: true VirtualRouterTemplate.create_dialog: true @@ -304,19 +327,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Status - #- 6 # Used CPU - #- 7 # Used Memory + #- 6 # Used CPU + #- 7 # Used Memory - 8 # Host - 9 # IPs - #- 10 # Start Time + #- 10 # Start Time - 11 # VNC - #- 12 # Hidden Template - #- 13 # Labels - #- 14 # Search data + #- 12 # Hidden Template + #- 13 # Labels + #- 14 # Search data actions: VM.refresh: true VM.create_dialog: true @@ -342,6 +365,7 @@ tabs: VM.terminate: true VM.terminate_hard: true VM.resize: true + VM.disk_resize: true VM.attachdisk: true VM.detachdisk: true VM.disk_saveas: true @@ -400,9 +424,9 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # State #- 6 # Labels #- 7 # Search data @@ -459,7 +483,7 @@ tabs: - 3 # Hosts - 4 # VNets - 5 # Datastores - #- 6 # Labels + #- 6 # Labels actions: Cluster.refresh: true Cluster.create_dialog: true @@ -483,16 +507,16 @@ tabs: - 2 # Name - 3 # Cluster - 4 # RVMs - #- 5 # Real CPU + #- 5 # Real CPU - 6 # Allocated CPU - #- 7 # Real MEM + #- 7 # Real MEM - 8 # Allocated MEM - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - #- 14 # Search data + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + #- 14 # Search data actions: Host.refresh: true Host.create_dialog: true @@ -512,7 +536,7 @@ tabs: - 1 # ID - 2 # Name - 3 # Endpoint - #- 4 # Labels + #- 4 # Labels actions: Zone.refresh: true Zone.create_dialog: true @@ -531,18 +555,18 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS + #- 7 # Basepath + #- 8 # TM + #- 9 # DS - 10 # Type - 11 # Status - #- 12 # Labels - #- 13 # Search data + #- 12 # Labels + #- 13 # Search data actions: Datastore.refresh: true Datastore.create_dialog: true @@ -565,19 +589,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - 11 # #VMs #- 12 # Target #- 13 # Labels - #- 14 # Search data + #- 14 # Search data actions: Image.refresh: true Image.create_dialog: true @@ -604,19 +628,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - #- 11 # #VMs + #- 11 # #VMs #- 12 # Target #- 13 # Labels - #- 14 # Search data + #- 14 # Search data actions: File.refresh: true File.create_dialog: true @@ -636,15 +660,15 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Apps - 7 # Driver - 8 # Zone #- 9 # Labels - #- 10 # Search data + #- 10 # Search data actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -663,18 +687,18 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Version + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Version - 6 # Size - 7 # State - #- 8 # Type + #- 8 # Type - 9 # Registration - 10 # Marketplace - - 11 # Zone - #- 12 # Labels - #- 13 # Search data + - 11 # Zone + #- 12 # Labels + #- 13 # Search data actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true @@ -703,16 +727,16 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Reservation - 6 # Cluster - #- 7 # Bridge + #- 7 # Bridge - 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels - #- 11 # Search data + #- 9 # VLAN ID + #- 10 # Labels + #- 11 # Search data actions: Network.refresh: true Network.create_dialog: true @@ -746,10 +770,10 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Labels + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Labels #- 6 # Search data actions: SecurityGroup.refresh: true @@ -768,7 +792,7 @@ tabs: panel_tabs: support_info_tab: true table_columns: - #- 0 # Checkbox + #- 0 # Checkbox - 1 # ID - 2 # Subject - 3 # Created at @@ -778,25 +802,44 @@ tabs: Support.create_dialog: true settings-tab: panel_tabs: - user_info_tab: true - user_config_tab: false - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true + settings_info_tab: true + settings_config_tab: false + settings_quotas_tab: true + settings_group_quotas_tab: true + settings_accounting_tab: true + settings_showback_tab: true + settings_auth_tab: true actions: - # The buttons inside the settings-tab panel user_info_tab are - # configured with users-tab/actions; User.update_password and - # User.login_token - # - # Buttons for user_config_tab + # Buttons for settings_info_tab + User.update_password: true + User.login_token: true + # Buttons for settings_config_tab Settings.change_language: true Settings.change_password: true Settings.change_view: true Settings.ssh_key: true Settings.login_token: true - # Edit button in user_quotas_tab + # Edit button in settings_quotas_tab User.quotas_dialog: false upgrade-top-tab: panel_tabs: actions: + vmgroup-tab: + panel_tabs: + vm_group_info_tab: true + vm_group_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + - 5 # Vms + #- 6 # Labels + #- 7 # Search data + actions: + VMGroup.create_dialog: true + VMGroup.update_dialog: true + VMGroup.chmod: true + VMGroup.chown: true + VMGroup.chgrp: true diff --git a/tmpl/admin_vcenter.yaml b/tmpl/admin_vcenter.yaml index 50d328f..02f44cc 100644 --- a/tmpl/admin_vcenter.yaml +++ b/tmpl/admin_vcenter.yaml @@ -1,6 +1,10 @@ %set oneflow = %%getVar('activer_oneflow','non') == 'oui' small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false +filter-view: true enabled_tabs: - dashboard-tab - instances-top-tab @@ -37,7 +41,7 @@ enabled_tabs: - settings-tab - support-tab - upgrade-top-tab -autorefresh: true + - vmgroup-tab features: # True to show showback monthly reports, and VM cost showback: true @@ -50,6 +54,22 @@ features: # will be set to the same value as VCPU, that will still be visible for the # end users instantiate_hide_cpu: false + + # False to not scale the CPU. Number [0, 1] to scale from VCPU + instantiate_cpu_factor: false + + # True to show the option to make an instance persistent + instantiate_persistent: true + + # True to show the datastore datatable to instantiate VM + show_ds_instantiate: false + + # True to show the host datatable to instantiate VM + show_host_instantiate: false + + # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will + # deployed to + vcenter_vm_folder: true tabs: dashboard-tab: # The following widgets can be used inside any of the '_per_row' settings @@ -85,20 +105,21 @@ tabs: user_groups_tab: true user_accounting_tab: true user_showback_tab: true + user_auth_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Name - 3 # Group - 4 # Auth driver - #- 5 # Password + #- 5 # Password - 6 # VMs - 7 # Memory - 8 # CPU - #- 9 # Group ID - #- 10 # Hidden User Data - #- 11 # Labels - #- 12 # Search data + #- 9 # Group ID + #- 10 # Hidden User Data + #- 11 # Labels + #- 12 # Search data actions: User.refresh: true User.create_dialog: true @@ -126,8 +147,7 @@ tabs: - 4 # VMs - 5 # Memory - 6 # CPU - #- 7 # Labels - #- 8 # Search data + #- 7 # Labels actions: Group.refresh: true Group.create_dialog: true @@ -151,8 +171,7 @@ tabs: - 5 # Hosts - 6 # VNets - 7 # Datastores - #- 8 # Labels - #- 9 # Search data + #- 8 # Labels actions: Vdc.refresh: true Vdc.create_dialog: true @@ -171,7 +190,7 @@ tabs: - 4 # Resource ID / Owned by - 5 # Allowed operations - 6 # Zone - #- 7 # ACL String + #- 7 # ACL String actions: Acl.refresh: true Acl.create_dialog: true @@ -186,11 +205,11 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels + #- 6 # Labels #- 7 # Search data actions: Template.refresh: true @@ -216,8 +235,10 @@ tabs: features: true input_output: true context: true + actions: true scheduling: true hybrid: true + vmgroup: true other: true %if %%oneflow oneflow-templates-tab: @@ -228,9 +249,9 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group #- 5 # Labels #- 6 # Search data actions: @@ -254,11 +275,11 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels + #- 6 # Labels #- 7 # Search data actions: VirtualRouterTemplate.refresh: true @@ -304,19 +325,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Status - #- 6 # Used CPU - #- 7 # Used Memory + #- 6 # Used CPU + #- 7 # Used Memory - 8 # Host - 9 # IPs - #- 10 # Start Time + #- 10 # Start Time - 11 # VNC - #- 12 # Hidden Template - #- 13 # Labels - #- 14 # Search data + #- 12 # Hidden Template + #- 13 # Labels + #- 14 # Search data actions: VM.refresh: true VM.create_dialog: true @@ -344,7 +365,8 @@ tabs: VM.resize: true VM.attachdisk: true VM.detachdisk: true - VM.disk_saveas: false + VM.disk_saveas: true + VM.disk_resize: true VM.attachnic: true VM.detachnic: true VM.snapshot_create: true @@ -359,7 +381,6 @@ tabs: VM.updateconf: true VM.edit_labels: true VM.menu_labels: true -%if %%oneflow oneflow-services-tab: panel_tabs: service_info_tab: true @@ -400,9 +421,9 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # State #- 6 # Labels #- 7 # Search data @@ -419,6 +440,30 @@ tabs: Service.edit_labels: true Service.menu_labels: true %end if + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Labels + #- 6 # Search data + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: true + VirtualRouter.chmod: true + VirtualRouter.delete: true + VirtualRouter.attachnic: true + VirtualRouter.detachnic: true + VirtualRouter.edit_labels: true + VirtualRouter.menu_labels: true infrastructure-top-tab: panel_tabs: actions: @@ -435,7 +480,7 @@ tabs: - 3 # Hosts - 4 # VNets - 5 # Datastores - #- 6 # Labels + #- 6 # Labels actions: Cluster.refresh: true Cluster.create_dialog: true @@ -459,16 +504,16 @@ tabs: - 2 # Name - 3 # Cluster - 4 # RVMs - #- 5 # Real CPU + #- 5 # Real CPU - 6 # Allocated CPU - #- 7 # Real MEM + #- 7 # Real MEM - 8 # Allocated MEM - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - #- 14 # Search data + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + #- 14 # Search data actions: Host.refresh: true Host.create_dialog: true @@ -488,7 +533,7 @@ tabs: - 1 # ID - 2 # Name - 3 # Endpoint - #- 4 # Labels + #- 4 # Labels actions: Zone.refresh: true Zone.create_dialog: true @@ -507,21 +552,21 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS + #- 7 # Basepath + #- 8 # TM + #- 9 # DS - 10 # Type - 11 # Status - #- 12 # Labels - #- 13 # Search data + #- 12 # Labels + #- 13 # Search data actions: Datastore.refresh: true - Datastore.create_dialog: true + Datastore.create_dialog: false Datastore.import_dialog: true Datastore.addtocluster: true Datastore.rename: true @@ -541,24 +586,24 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - 11 # #VMs #- 12 # Target #- 13 # Labels - #- 14 # Search data + #- 14 # Search data actions: Image.refresh: true Image.create_dialog: true - Image.upload_marketplace_dialog: false Image.import_dialog: true + Image.upload_marketplace_dialog: false Image.rename: true Image.chown: true Image.chgrp: true @@ -580,19 +625,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - #- 11 # #VMs + #- 11 # #VMs #- 12 # Target #- 13 # Labels - #- 14 # Search data + #- 14 # Search data actions: File.refresh: true File.create_dialog: true @@ -612,15 +657,15 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Apps - 7 # Driver - 8 # Zone #- 9 # Labels - #- 10 # Search data + #- 10 # Search data actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -639,18 +684,18 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Version + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Version - 6 # Size - 7 # State - #- 8 # Type + #- 8 # Type - 9 # Registration - 10 # Marketplace - - 11 # Zone - #- 12 # Labels - #- 13 # Search data + - 11 # Zone + #- 12 # Labels + #- 13 # Search data actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true @@ -679,16 +724,16 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Reservation - 6 # Cluster - #- 7 # Bridge + #- 7 # Bridge - 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels - #- 11 # Search data + #- 9 # VLAN ID + #- 10 # Labels + #- 11 # Search data actions: Network.refresh: true Network.create_dialog: true @@ -708,30 +753,6 @@ tabs: Network.update_ar: true Network.edit_labels: true Network.menu_labels: true - vrouters-tab: - panel_tabs: - virtual_router_info_tab: true - virtual_router_vms_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Labels - #- 6 # Search data - actions: - VirtualRouter.refresh: true - VirtualRouter.create_dialog: true - VirtualRouter.rename: true - VirtualRouter.chown: true - VirtualRouter.chgrp: true - VirtualRouter.chmod: true - VirtualRouter.delete: true - VirtualRouter.attachnic: true - VirtualRouter.detachnic: true - VirtualRouter.edit_labels: true - VirtualRouter.menu_labels: true vnets-topology-tab: panel_tabs: actions: @@ -746,10 +767,10 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Labels + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Labels #- 6 # Search data actions: SecurityGroup.refresh: true @@ -768,7 +789,7 @@ tabs: panel_tabs: support_info_tab: true table_columns: - #- 0 # Checkbox + #- 0 # Checkbox - 1 # ID - 2 # Subject - 3 # Created at @@ -778,25 +799,44 @@ tabs: Support.create_dialog: true settings-tab: panel_tabs: - user_info_tab: true - user_config_tab: false - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true + settings_info_tab: true + settings_config_tab: false + settings_quotas_tab: true + settings_group_quotas_tab: true + settings_accounting_tab: true + settings_showback_tab: true + settings_auth_tab: true actions: - # The buttons inside the settings-tab panel user_info_tab are - # configured with users-tab/actions; User.update_password and - # User.login_token - # - # Buttons for user_config_tab + # Buttons for settings_info_tab + User.update_password: true + User.login_token: true + # Buttons for settings_config_tab Settings.change_language: true Settings.change_password: true Settings.change_view: true Settings.ssh_key: true Settings.login_token: true - # Edit button in user_quotas_tab + # Edit button in settings_quotas_tab User.quotas_dialog: false upgrade-top-tab: panel_tabs: actions: + vmgroup-tab: + panel_tabs: + vm_group_info_tab: true + vm_group_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + - 5 # Vms + #- 6 # Labels + #- 7 # Search data + actions: + VMGroup.create_dialog: true + VMGroup.update_dialog: true + VMGroup.chmod: true + VMGroup.chown: true + VMGroup.chgrp: true diff --git a/tmpl/cloud.yaml b/tmpl/cloud.yaml index a30471b..b67eb8c 100644 --- a/tmpl/cloud.yaml +++ b/tmpl/cloud.yaml @@ -1,4 +1,8 @@ +%set oneflow = %%getVar('activer_oneflow','non') == 'oui' provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false enabled_tabs: - provision-tab - settings-tab @@ -14,6 +18,15 @@ features: # will be set to the same value as VCPU, that will still be visible for the # end users instantiate_hide_cpu: false + + # False to not scale the CPU. Number [0, 1] to scale from VCPU + instantiate_cpu_factor: false + + # True to show the option to make an instance persistent + instantiate_persistent: true + + # True to allow to create machines to cloud users + cloud_vm_create: true tabs: provision-tab: panel_tabs: @@ -28,6 +41,11 @@ tabs: vm_template_tab: false vm_log_tab: false provision_tabs: +%if %%oneflow + flows: true +%else + flows: false +%end if templates: true actions: &provisionactions # In the cloud view, delete is the equivalent @@ -74,45 +92,44 @@ tabs: capacity_select: true # True to allow NIC customization network_select: true + # True to allow vmgroup customization + vmgroup_select: true # True to allow DISK size customization disk_resize: true + # True to allow datastore customization + datastore_select: true settings-tab: panel_tabs: - user_info_tab: false - user_config_tab: true - user_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true + settings_info_tab: false + settings_config_tab: true + settings_quotas_tab: true + settings_accounting_tab: true + settings_showback_tab: true actions: - # The buttons inside the settings-tab panel user_info_tab are - # configured with users-tab/actions; User.update_password and - # User.login_token - # - # Buttons for user_config_tab + # Buttons for settings_info_tab + User.update_password: true + User.login_token: true + # Buttons for settings_config_tab Settings.change_language: true Settings.change_password: true Settings.change_view: true Settings.ssh_key: true Settings.login_token: true - # Edit button in user_quotas_tab + # Edit button in settings_quotas_tab User.quotas_dialog: false - users-tab: - actions: - User.update_password: true - User.login_token: true vms-tab: actions: *provisionactions images-tab: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Onwer + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - 11 # #VMs @@ -121,19 +138,45 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Reservation - #- 6 # Cluster - #- 7 # Bridge - #- 8 # Leases - #- 9 # VLAN ID + - 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Reservation + #- 6 # Cluster + #- 7 # Bridge + #- 8 # Leases + #- 9 # VLAN ID secgroups-tab: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Labels + - 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Labels + vmgroup-tab: + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + - 5 # Vms + #- 6 # Labels + #- 7 # Search data + datastores-tab: + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Capacity + #- 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + #- 10 # Type + - 11 # Status + #- 12 # Labels + #- 13 # Search data \ No newline at end of file diff --git a/tmpl/cloud_vcenter.yaml b/tmpl/cloud_vcenter.yaml new file mode 100644 index 0000000..f6cd45d --- /dev/null +++ b/tmpl/cloud_vcenter.yaml @@ -0,0 +1,157 @@ +%set oneflow = %%getVar('activer_oneflow','non') == 'oui' +provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false +enabled_tabs: + - provision-tab + - settings-tab +features: + # True to show showback monthly reports, and VM cost + showback: true + + # Allows to change the security groups for each network interface + # on the VM creation dialog + secgroups: false + + # True to hide the CPU setting in the VM creation dialog. The CPU setting + # will be set to the same value as VCPU, that will still be visible for the + # end users + instantiate_hide_cpu: true + + # False to not scale the CPU. Number [0, 1] to scale from VCPU + instantiate_cpu_factor: false + + # True to show the option to make an instance persistent + instantiate_persistent: true + + # True to allow to create machines to cloud users + cloud_vm_create: true +tabs: + provision-tab: + panel_tabs: + vm_info_tab: false + vm_capacity_tab: false + vm_storage_tab: false + vm_network_tab: false + vm_snapshot_tab: false + vm_placement_tab: false + vm_actions_tab: false + vm_conf_tab: false + vm_template_tab: false + vm_log_tab: false + provision_tabs: +%if %%oneflow + flows: true +%else + flows: false +%end if + templates: false + actions: &provisionactions + # In the cloud view, delete is the equivalent + # of 'onetemplate chmod --recursive' + Template.chmod: false + + # In the cloud view, delete is the equivalent + # of 'onetemplate delete --recursive' + Template.delete: true + VM.rename: false + VM.resume: true + VM.reboot: true + VM.reboot_hard: true + VM.poweroff: true + VM.poweroff_hard: true + VM.undeploy: false + VM.undeploy_hard: false + VM.terminate: true + VM.terminate_hard: true + VM.resize: false + VM.attachdisk: false + VM.detachdisk: false + VM.disk_saveas: false + VM.attachnic: false + VM.detachnic: false + VM.snapshot_create: false + VM.snapshot_revert: false + VM.snapshot_delete: false + VM.disk_snapshot_create: false + VM.disk_snapshot_revert: false + VM.disk_snapshot_delete: false + VM.save_as_template: true + dashboard: + # Connected user's quotas + quotas: true + # Overview of connected user's VMs + vms: true + # Group's quotas + groupquotas: false + # Overview of group's VMs + groupvms: false + create_vm: + # True to allow capacity (CPU, MEMORY, VCPU) customization + capacity_select: true + # True to allow NIC customization + network_select: true + # True to allow DISK size customization + disk_resize: true + settings-tab: + panel_tabs: + settings_info_tab: false + settings_config_tab: true + settings_quotas_tab: true + settings_accounting_tab: true + settings_showback_tab: true + actions: + # The buttons inside the settings-tab panel settings_info_tab are + # configured with users-tab/actions; User.update_password and + # User.login_token + # + # Buttons for settings_config_tab + Settings.change_language: true + Settings.change_password: true + Settings.change_view: true + Settings.ssh_key: true + Settings.login_token: true + # Edit button in settings_quotas_tab + User.quotas_dialog: false + users-tab: + actions: + User.update_password: true + User.login_token: true + vms-tab: + actions: *provisionactions + images-tab: + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + - 5 # Datastore + #- 6 # Size + - 7 # Type + #- 8 # Registration time + #- 9 # Persistent + - 10 # Status + - 11 # #VMs + #- 12 # Target + vnets-tab: + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Reservation + #- 6 # Cluster + #- 7 # Bridge + #- 8 # Leases + #- 9 # VLAN ID + secgroups-tab: + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Labels \ No newline at end of file diff --git a/tmpl/groupadmin.yaml b/tmpl/groupadmin.yaml index f977abc..563856e 100644 --- a/tmpl/groupadmin.yaml +++ b/tmpl/groupadmin.yaml @@ -1,6 +1,10 @@ %set oneflow = %%getVar('activer_oneflow','non') == 'oui' small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false +filter-view: true enabled_tabs: - dashboard-tab - instances-top-tab @@ -15,10 +19,6 @@ enabled_tabs: - oneflow-templates-tab %end if - vrouter-templates-tab - #- infrastructure-top-tab - #- clusters-tab - #- hosts-tab - #- zones-tab #- storage-top-tab #- datastores-tab #- images-tab @@ -29,6 +29,10 @@ enabled_tabs: - vnets-tab - vnets-topology-tab - secgroups-tab + #- infrastructure-top-tab + #- clusters-tab + #- hosts-tab + #- zones-tab - system-top-tab - users-tab - groups-tab @@ -36,7 +40,8 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab -autorefresh: true + #- upgrade-top-tab + - vmgroup-tab features: # True to show showback monthly reports, and VM cost showback: true @@ -49,6 +54,22 @@ features: # will be set to the same value as VCPU, that will still be visible for the # end users instantiate_hide_cpu: false + + # False to not scale the CPU. Number [0, 1] to scale from VCPU + instantiate_cpu_factor: false + + # True to show the option to make an instance persistent + instantiate_persistent: true + + # True to show the datastore datatable to instantiate VM + show_ds_instantiate: false + + # True to show the host datatable to instantiate VM + show_host_instantiate: false + + # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will + # deployed to + vcenter_vm_folder: false tabs: dashboard-tab: # The following widgets can be used inside any of the '_per_row' settings @@ -85,20 +106,21 @@ tabs: user_groups_tab: true user_accounting_tab: true user_showback_tab: true + user_auth_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Name - #- 3 # Group - #- 4 # Auth driver - #- 5 # Password + #- 3 # Group + #- 4 # Auth driver + #- 5 # Password - 6 # VMs - 7 # Memory - 8 # CPU - #- 9 # Group ID - #- 10 # Hidden User Data - #- 11 # Labels - #- 12 # Search data + #- 9 # Group ID + #- 10 # Hidden User Data + #- 11 # Labels + #- 12 # Search data actions: User.refresh: true User.create_dialog: true @@ -126,8 +148,7 @@ tabs: - 4 # VMs - 5 # Memory - 6 # CPU - #- 7 # Labels - #- 6 # Search data + #- 7 # Labels actions: Group.refresh: true Group.create_dialog: false @@ -151,8 +172,7 @@ tabs: - 5 # Hosts - 6 # VNets - 7 # Datastores - #- 8 # Labels - #- 9 # Search data + #- 8 # Labels actions: Vdc.refresh: true Vdc.create_dialog: true @@ -171,7 +191,7 @@ tabs: - 4 # Resource ID / Owned by - 5 # Allowed operations - 6 # Zone - #- 7 # ACL String + #- 7 # ACL String actions: Acl.refresh: true Acl.create_dialog: true @@ -186,12 +206,12 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels - #- 7 # Search data + #- 6 # Labels + #- 7 # Search data actions: Template.refresh: true Template.create_dialog: false @@ -216,8 +236,10 @@ tabs: features: true input_output: true context: true + actions: true scheduling: true hybrid: true + vmgroup: true other: true %if %%oneflow oneflow-templates-tab: @@ -228,11 +250,11 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group #- 5 # Labels - #- 6 # Search data + #- 6 # Search data actions: ServiceTemplate.refresh: true ServiceTemplate.create_dialog: false @@ -254,12 +276,12 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels - #- 7 # Search data + #- 6 # Labels + #- 7 # Search data actions: VirtualRouterTemplate.refresh: true VirtualRouterTemplate.create_dialog: false @@ -302,21 +324,21 @@ tabs: vm_template_tab: false vm_log_tab: false table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - - 5 # Status + - 0 # Checkbox + - 1 # ID + - 2 # Name + #- 3 # Owner + - 4 # Group + - 5 # Status #- 6 # Used CPU #- 7 # Used Memory #- 8 # Host - - 9 # IPs + - 9 # IPs #- 10 # Start Time - - 11 # VNC + - 11 # VNC #- 12 # Hidden Template #- 13 # Labels - #- 14 # Search data + #- 14 # Search data actions: VM.refresh: true VM.create_dialog: true @@ -345,6 +367,7 @@ tabs: VM.attachdisk: false VM.detachdisk: false VM.disk_saveas: false + VM.disk_resize: false VM.attachnic: false VM.detachnic: false VM.snapshot_create: false @@ -400,12 +423,12 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name + - 2 # Name + #- 3 # Owner + - 4 # Group - 5 # State #- 6 # Labels - #- 7 # Search data + #- 7 # Search data actions: Service.refresh: true Service.create_dialog: true @@ -419,6 +442,30 @@ tabs: Service.edit_labels: true Service.menu_labels: true %end if + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Labels + #- 6 # Search data + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: false + VirtualRouter.chmod: false + VirtualRouter.delete: true + VirtualRouter.attachnic: false + VirtualRouter.detachnic: false + VirtualRouter.edit_labels: true + VirtualRouter.menu_labels: true infrastructure-top-tab: panel_tabs: actions: @@ -435,7 +482,7 @@ tabs: - 3 # Hosts - 4 # VNets - 5 # Datastores - #- 6 # Labels + #- 6 # Labels actions: Cluster.refresh: true Cluster.create_dialog: true @@ -459,16 +506,16 @@ tabs: - 2 # Name - 3 # Cluster - 4 # RVMs - #- 5 # Real CPU + #- 5 # Real CPU - 6 # Allocated CPU - #- 7 # Real MEM + #- 7 # Real MEM - 8 # Allocated MEM - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels - #- 14 # Search data + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + #- 14 # Search data actions: Host.refresh: true Host.create_dialog: true @@ -488,7 +535,7 @@ tabs: - 1 # ID - 2 # Name - 3 # Endpoint - #- 4 # Labels + #- 4 # Labels actions: Zone.refresh: true Zone.create_dialog: true @@ -507,18 +554,18 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS + #- 7 # Basepath + #- 8 # TM + #- 9 # DS - 10 # Type - 11 # Status - #- 12 # Labels - #- 13 # Search data + #- 12 # Labels + #- 13 # Search data actions: Datastore.refresh: true Datastore.create_dialog: true @@ -541,19 +588,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - 11 # #VMs #- 12 # Target #- 13 # Labels - #- 14 # Search data + #- 14 # Search data actions: Image.refresh: true Image.create_dialog: true @@ -580,19 +627,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - #- 11 # #VMs + #- 11 # #VMs #- 12 # Target #- 13 # Labels - #- 14 # Search data + #- 14 # Search data actions: File.refresh: true File.create_dialog: true @@ -612,15 +659,15 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Apps - 7 # Driver - 8 # Zone #- 9 # Labels - #- 10 # Search data + #- 10 # Search data actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -639,18 +686,18 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Version + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Version - 6 # Size - 7 # State - #- 8 # Type + #- 8 # Type - 9 # Registration - 10 # Marketplace - - 11 # Zone - #- 12 # Labels - #- 13 # Search data + - 11 # Zone + #- 12 # Labels + #- 13 # Search data actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true @@ -679,16 +726,16 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Reservation - #- 6 # Cluster - #- 7 # Bridge - #- 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels - #- 11 # Search data + #- 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Reservation + #- 6 # Cluster + #- 7 # Bridge + #- 8 # Leases + #- 9 # VLAN ID + #- 10 # Labels + #- 11 # Search data actions: Network.refresh: true Network.create_dialog: false @@ -708,30 +755,6 @@ tabs: Network.update_ar: false Network.edit_labels: true Network.menu_labels: true - vrouters-tab: - panel_tabs: - virtual_router_info_tab: true - virtual_router_vms_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Labels - #- 6 # Search data - actions: - VirtualRouter.refresh: true - VirtualRouter.create_dialog: true - VirtualRouter.rename: true - VirtualRouter.chown: true - VirtualRouter.chgrp: false - VirtualRouter.chmod: false - VirtualRouter.delete: true - VirtualRouter.attachnic: false - VirtualRouter.detachnic: false - VirtualRouter.edit_labels: true - VirtualRouter.menu_labels: true vnets-topology-tab: panel_tabs: actions: @@ -746,11 +769,11 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Labels - #- 6 # Search data + #- 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Labels + #- 6 # Search data actions: SecurityGroup.refresh: true SecurityGroup.create_dialog: false @@ -768,7 +791,7 @@ tabs: panel_tabs: support_info_tab: true table_columns: - #- 0 # Checkbox + #- 0 # Checkbox - 1 # ID - 2 # Subject - 3 # Created at @@ -778,22 +801,44 @@ tabs: Support.create_dialog: true settings-tab: panel_tabs: - user_info_tab: true - user_config_tab: false - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true + settings_info_tab: true + settings_config_tab: false + settings_quotas_tab: true + settings_group_quotas_tab: true + settings_accounting_tab: true + settings_showback_tab: true + settings_auth_tab: true actions: - # The buttons inside the settings-tab panel user_info_tab are - # configured with users-tab/actions; User.update_password and - # User.login_token - # - # Buttons for user_config_tab + # Buttons for settings_info_tab + User.update_password: true + User.login_token: true + # Buttons for settings_config_tab Settings.change_language: true Settings.change_password: true Settings.change_view: true Settings.ssh_key: true Settings.login_token: true - # Edit button in user_quotas_tab - User.quotas_dialog: false \ No newline at end of file + # Edit button in settings_quotas_tab + User.quotas_dialog: false + upgrade-top-tab: + panel_tabs: + actions: + vmgroup-tab: + panel_tabs: + vm_group_info_tab: true + vm_group_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + - 5 # Vms + #- 6 # Labels + #- 7 # Search data + actions: + VMGroup.create_dialog: true + VMGroup.update_dialog: true + VMGroup.chmod: true + VMGroup.chown: true + VMGroup.chgrp: true diff --git a/tmpl/groupadmin_vcenter.yaml b/tmpl/groupadmin_vcenter.yaml index 1aeaf59..f536b18 100644 --- a/tmpl/groupadmin_vcenter.yaml +++ b/tmpl/groupadmin_vcenter.yaml @@ -1,6 +1,10 @@ %set oneflow = %%getVar('activer_oneflow','non') == 'oui' small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false +filter-view: true enabled_tabs: - dashboard-tab - instances-top-tab @@ -15,10 +19,6 @@ enabled_tabs: - oneflow-templates-tab %end if #- vrouter-templates-tab - #- infrastructure-top-tab - #- clusters-tab - #- hosts-tab - #- zones-tab #- storage-top-tab #- datastores-tab #- images-tab @@ -29,6 +29,10 @@ enabled_tabs: - vnets-tab - vnets-topology-tab #- secgroups-tab + #- infrastructure-top-tab + #- clusters-tab + #- hosts-tab + #- zones-tab - system-top-tab - users-tab - groups-tab @@ -36,7 +40,8 @@ enabled_tabs: #- acls-tab - settings-tab #- support-tab -autorefresh: true + #- upgrade-top-tab + - vmgroup-tab features: # True to show showback monthly reports, and VM cost showback: true @@ -44,6 +49,21 @@ features: # Allows to change the security groups for each network interface # on the VM creation dialog secgroups: false + + # True to hide the CPU setting in the VM creation dialog. The CPU setting + # will be set to the same value as VCPU, that will still be visible for the + # end users + instantiate_hide_cpu: true + + # False to not scale the CPU. Number [0, 1] to scale from VCPU + instantiate_cpu_factor: false + + # True to show the option to make an instance persistent + instantiate_persistent: true + + # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will + # deployed to + vcenter_vm_folder: false tabs: dashboard-tab: # The following widgets can be used inside any of the '_per_row' settings @@ -80,27 +100,29 @@ tabs: user_groups_tab: true user_accounting_tab: true user_showback_tab: true + user_auth_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Name - #- 3 # Group - #- 4 # Auth driver - - 5 # VMs - - 6 # Memory - - 7 # CPU - #- 8 # Group ID - #- 9 # Hidden User Data - #- 10 # Labels + #- 3 # Group + #- 4 # Auth driver + #- 5 # Password + - 6 # VMs + - 7 # Memory + - 8 # CPU + #- 9 # Group ID + #- 10 # Hidden User Data + #- 11 # Labels + #- 12 # Search data actions: User.refresh: true User.create_dialog: true User.update_password: true + User.login_token: true User.quotas_dialog: true User.groups_dialog: false User.chgrp: false - User.addgroup: false - User.delgroup: false User.change_authentication: false User.delete: true User.edit_labels: true @@ -120,7 +142,7 @@ tabs: - 4 # VMs - 5 # Memory - 6 # CPU - #- 7 # Labels + #- 7 # Labels actions: Group.refresh: true Group.create_dialog: false @@ -144,7 +166,7 @@ tabs: - 5 # Hosts - 6 # VNets - 7 # Datastores - #- 8 # Labels + #- 8 # Labels actions: Vdc.refresh: true Vdc.create_dialog: true @@ -163,7 +185,7 @@ tabs: - 4 # Resource ID / Owned by - 5 # Allowed operations - 6 # Zone - #- 7 # ACL String + #- 7 # ACL String actions: Acl.refresh: true Acl.create_dialog: true @@ -178,11 +200,12 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels + #- 6 # Labels + #- 7 # Search data actions: Template.refresh: true Template.create_dialog: false @@ -207,8 +230,10 @@ tabs: features: true input_output: true context: true + actions: true scheduling: true hybrid: true + vmgroup: true other: true %if %%oneflow oneflow-templates-tab: @@ -219,10 +244,11 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group #- 5 # Labels + #- 6 # Search data actions: ServiceTemplate.refresh: true ServiceTemplate.create_dialog: false @@ -244,15 +270,17 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Registration time - #- 6 # Labels + #- 6 # Labels + #- 7 # Search data actions: VirtualRouterTemplate.refresh: true VirtualRouterTemplate.create_dialog: false VirtualRouterTemplate.update_dialog: false + VirtualRouterTemplate.instantiate_dialog: false VirtualRouterTemplate.rename: true VirtualRouterTemplate.chown: true VirtualRouterTemplate.chgrp: false @@ -292,18 +320,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name + - 2 # Name + #- 3 # Owner + - 4 # Group - 5 # Status - #- 6 # Used CPU - #- 7 # Used Memory - #- 8 # Host + #- 6 # Used CPU + #- 7 # Used Memory + #- 8 # Host - 9 # IPs - #- 10 # Start Time + #- 10 # Start Time - 11 # VNC - #- 12 # Hidden Template - #- 13 # Labels + #- 12 # Hidden Template + #- 13 # Labels + #- 14 # Search data actions: VM.refresh: true VM.create_dialog: true @@ -332,6 +361,7 @@ tabs: VM.attachdisk: false VM.detachdisk: false VM.disk_saveas: false + VM.disk_resize: false VM.attachnic: false VM.detachnic: false VM.snapshot_create: false @@ -387,13 +417,15 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name + - 2 # Name + #- 3 # Owner + - 4 # Group - 5 # State #- 6 # Labels + #- 7 # Search data actions: Service.refresh: true + Service.create_dialog: true Service.chown: true Service.chgrp: false Service.chmod: false @@ -404,6 +436,30 @@ tabs: Service.edit_labels: true Service.menu_labels: true %end if + vrouters-tab: + panel_tabs: + virtual_router_info_tab: true + virtual_router_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Labels + #- 6 # Search data + actions: + VirtualRouter.refresh: true + VirtualRouter.create_dialog: true + VirtualRouter.rename: true + VirtualRouter.chown: true + VirtualRouter.chgrp: false + VirtualRouter.chmod: false + VirtualRouter.delete: true + VirtualRouter.attachnic: false + VirtualRouter.detachnic: false + VirtualRouter.edit_labels: true + VirtualRouter.menu_labels: true infrastructure-top-tab: panel_tabs: actions: @@ -420,7 +476,7 @@ tabs: - 3 # Hosts - 4 # VNets - 5 # Datastores - #- 6 # Labels + #- 6 # Labels actions: Cluster.refresh: true Cluster.create_dialog: true @@ -444,15 +500,16 @@ tabs: - 2 # Name - 3 # Cluster - 4 # RVMs - #- 5 # Real CPU + #- 5 # Real CPU - 6 # Allocated CPU - #- 7 # Real MEM + #- 7 # Real MEM - 8 # Allocated MEM - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - #- 13 # Labels + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + #- 14 # Search data actions: Host.refresh: true Host.create_dialog: true @@ -472,7 +529,7 @@ tabs: - 1 # ID - 2 # Name - 3 # Endpoint - #- 4 # Labels + #- 4 # Labels actions: Zone.refresh: true Zone.create_dialog: true @@ -491,20 +548,22 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS + #- 7 # Basepath + #- 8 # TM + #- 9 # DS - 10 # Type - 11 # Status - #- 12 # Labels + #- 12 # Labels + #- 13 # Search data actions: Datastore.refresh: true Datastore.create_dialog: true + Datastore.import_dialog: false Datastore.addtocluster: true Datastore.rename: true Datastore.chown: true @@ -523,23 +582,24 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - 11 # #VMs #- 12 # Target #- 13 # Labels + #- 14 # Search data actions: Image.refresh: true Image.create_dialog: true - Image.upload_marketplace_dialog: false Image.import_dialog: true + Image.upload_marketplace_dialog: false Image.rename: true Image.chown: true Image.chgrp: true @@ -561,18 +621,19 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time + #- 6 # Size + - 7 # Type + #- 8 # Registration time #- 9 # Persistent - 10 # Status - #- 11 # #VMs + #- 11 # #VMs #- 12 # Target #- 13 # Labels + #- 14 # Search data actions: File.refresh: true File.create_dialog: true @@ -592,14 +653,15 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Name + - 3 # Owner + - 4 # Group - 5 # Capacity - 6 # Apps - 7 # Driver - 8 # Zone #- 9 # Labels + #- 10 # Search data actions: MarketPlace.refresh: true MarketPlace.create_dialog: true @@ -618,17 +680,18 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - #- 5 # Version + - 2 # Name + - 3 # Owner + - 4 # Group + #- 5 # Version - 6 # Size - 7 # State - #- 8 # Type + #- 8 # Type - 9 # Registration - 10 # Marketplace - - 11 # Zone - #- 12 # Labels + - 11 # Zone + #- 12 # Labels + #- 13 # Search data actions: MarketPlaceApp.refresh: true MarketPlaceApp.create_dialog: true @@ -657,15 +720,16 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Reservation - #- 6 # Cluster - #- 7 # Bridge - #- 8 # Leases - #- 9 # VLAN ID - #- 10 # Labels + #- 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Reservation + #- 6 # Cluster + #- 7 # Bridge + #- 8 # Leases + #- 9 # VLAN ID + #- 10 # Labels + #- 11 # Search data actions: Network.refresh: true Network.create_dialog: false @@ -685,28 +749,6 @@ tabs: Network.update_ar: false Network.edit_labels: true Network.menu_labels: true - vrouters-tab: - panel_tabs: - virtual_router_info_tab: true - virtual_router_vms_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - #- 3 # Group - - 4 # Name - actions: - VirtualRouter.refresh: true - VirtualRouter.create_dialog: true - VirtualRouter.rename: true - VirtualRouter.chown: true - VirtualRouter.chgrp: false - VirtualRouter.chmod: false - VirtualRouter.delete: true - VirtualRouter.attachnic: false - VirtualRouter.detachnic: false - VirtualRouter.edit_labels: true - VirtualRouter.menu_labels: true vnets-topology-tab: panel_tabs: actions: @@ -721,10 +763,11 @@ tabs: table_columns: - 0 # Checkbox - 1 # ID - #- 2 # Owner - #- 3 # Group - - 4 # Name - #- 5 # Labels + #- 2 # Name + #- 3 # Owner + - 4 # Group + #- 5 # Labels + #- 6 # Search data actions: SecurityGroup.refresh: true SecurityGroup.create_dialog: false @@ -742,7 +785,7 @@ tabs: panel_tabs: support_info_tab: true table_columns: - #- 0 # Checkbox + #- 0 # Checkbox - 1 # ID - 2 # Subject - 3 # Created at @@ -752,10 +795,44 @@ tabs: Support.create_dialog: true settings-tab: panel_tabs: - user_info_tab: true - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true + settings_info_tab: true + settings_config_tab: false + settings_quotas_tab: true + settings_group_quotas_tab: true + settings_accounting_tab: true + settings_showback_tab: true + settings_auth_tab: true actions: + # Buttons for settings_info_tab + User.update_password: true + User.login_token: true + # Buttons for settings_config_tab + Settings.change_language: true + Settings.change_password: true + Settings.change_view: true + Settings.ssh_key: true + Settings.login_token: true + # Edit button in settings_quotas_tab User.quotas_dialog: false + upgrade-top-tab: + panel_tabs: + actions: + vmgroup-tab: + panel_tabs: + vm_group_info_tab: true + vm_group_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Owner + - 4 # Group + - 5 # Vms + #- 6 # Labels + #- 7 # Search data + actions: + VMGroup.create_dialog: true + VMGroup.update_dialog: true + VMGroup.chmod: true + VMGroup.chown: true + VMGroup.chgrp: true \ No newline at end of file diff --git a/tmpl/sunstone-ldap_auth.conf b/tmpl/sunstone-ldap_auth.conf deleted file mode 100644 index 1853bce..0000000 --- a/tmpl/sunstone-ldap_auth.conf +++ /dev/null @@ -1,39 +0,0 @@ -%if %%getVar('sunstone_auth_modes', None) == 'ldap' -server 1: - # Ldap user able to query, if not set connects as anonymous. For - # Active Directory append the domain name. Example: - # Administrator@my.domain.com - #:user: 'admin' - #:password: 'password' - - # Ldap authentication method - :auth_method: :simple - - # Ldap server - :host: %%adresse_ip_ldap - :port: %%ldap_port -%if %%getVar('ldap_tls', 'non') == 'oui' - - # Uncomment this line for tls conections - :encryption: :simple_tls -%end if - - # base hierarchy where to search for users and groups - :base: %%ldap_base_dn - - # group the users need to belong to. If not set any user will do - #:group: 'cn=cloud,ou=groups,dc=domain' - - # field that holds the user name, if not set 'cn' will be used - :user_field: 'uid' - - # for Active Directory use this user_field instead - #:user_field: 'sAMAccountName' - - # Default group ID used for users in an AD group not mapped - :mapping_default: 1 - -# List the order the servers are queried -:order: - - server 1 -%end if diff --git a/tmpl/sunstone-logos.yaml b/tmpl/sunstone-logos.yaml new file mode 100644 index 0000000..59449a0 --- /dev/null +++ b/tmpl/sunstone-logos.yaml @@ -0,0 +1,11 @@ +# You can add custom logos here, or disable any of the default ones commenting +# out its line +- { 'name': "Arch Linux", 'path': "images/logos/arch.png"} +- { 'name': "CentOS", 'path': "images/logos/centos.png"} +- { 'name': "Debian", 'path': "images/logos/debian.png"} +- { 'name': "Fedora", 'path': "images/logos/fedora.png"} +- { 'name': "Linux", 'path': "images/logos/linux.png"} +- { 'name': "Redhat", 'path': "images/logos/redhat.png"} +- { 'name': "Ubuntu", 'path': "images/logos/ubuntu.png"} +- { 'name': "Windows XP/2003", 'path': "images/logos/windowsxp.png"} +- { 'name': "Windows 8", 'path': "images/logos/windows8.png"} \ No newline at end of file diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf index cce60bd..c9046f2 100644 --- a/tmpl/sunstone-server.conf +++ b/tmpl/sunstone-server.conf @@ -1,5 +1,5 @@ # -------------------------------------------------------------------------- # -# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems # +# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. You may obtain # @@ -37,7 +37,7 @@ # # NOTE. memcache needs a separate memcached server to be configured. Refer # to memcached documentation to configure the server. -:sessions: memcache-dalli +:sessions: memory # Memcache configuration :memcache_host: localhost @@ -51,6 +51,10 @@ # prod, the minified js will be used (dist/main.js) :env: 'prod' +# Maximum allowed size of uploaded images (in bytes). Leave commented for +# unlimited size +# :max_upload_file_size: 10737418240 # 10 GiB + ################################################################################ # Log ################################################################################ @@ -72,7 +76,7 @@ # Auth ################################################################################ -# Authentication driver for incomming requests +# Authentication driver for incoming requests # sunstone: for OpenNebula's user-password scheme # x509: for x509 certificates based authentication # opennebula: the authentication will be done by the opennebula core using the @@ -87,12 +91,6 @@ # :core_auth: cipher -# For external authentication drivers, such as LDAP. Performs a URL encoding -# on the credentials sent to OpenNebula, e.g. secret%20password -# This only works with "opennebula" auth. -# -#:encode_user_password: true - ################################################################################ # Check Upgrades ################################################################################ @@ -123,6 +121,8 @@ :vnc_proxy_ipv6: false :vnc_request_password: false +# Login Session Length in seconds, defaults to 1 hour. +#:session_expire_time: 3600 # Default language setting :lang: %%langue_sunstone @@ -183,7 +183,9 @@ # - other :routes: +%if %%getVar('activer_oneflow', 'non') == 'oui' - oneflow +%end if %if %%getVar('activer_market_views', 'non') == 'oui' - appmarket %end if diff --git a/tmpl/user.yaml b/tmpl/user.yaml index 3374d38..0de57e4 100644 --- a/tmpl/user.yaml +++ b/tmpl/user.yaml @@ -1,6 +1,10 @@ %set oneflow = %%getVar('activer_oneflow','non') == 'oui' small_logo: images/opennebula-5.0.png provision_logo: images/opennebula-5.0.png +link_logo: +text_link_logo: +confirm_vms: false +filter-view: true enabled_tabs: - dashboard-tab - instances-top-tab @@ -37,7 +41,7 @@ enabled_tabs: - settings-tab #- support-tab #- upgrade-top-tab -autorefresh: true + - vmgroup-tab features: # True to show showback monthly reports, and VM cost showback: true @@ -50,6 +54,22 @@ features: # will be set to the same value as VCPU, that will still be visible for the # end users instantiate_hide_cpu: false + + # False to not scale the CPU. Number [0, 1] to scale from VCPU + instantiate_cpu_factor: false + + # True to show the option to make an instance persistent + instantiate_persistent: true + + # True to show the datastore datatable to instantiate VM + show_ds_instantiate: false + + # True to show the host datatable to instantiate VM + show_host_instantiate: false + + # True to show an input to specify the the VMs and Template path/folder where a vCenter VM will + # deployed to + vcenter_vm_folder: false tabs: dashboard-tab: # The following widgets can be used inside any of the '_per_row' settings @@ -85,6 +105,7 @@ tabs: user_groups_tab: true user_accounting_tab: true user_showback_tab: true + user_auth_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -214,8 +235,10 @@ tabs: features: true input_output: true context: true + actions: true scheduling: false hybrid: true + vmgroup: true other: true %if %%oneflow oneflow-templates-tab: @@ -343,6 +366,7 @@ tabs: VM.attachdisk: true VM.detachdisk: true VM.disk_saveas: true + VM.disk_resize: false VM.attachnic: true VM.detachnic: true VM.snapshot_create: true @@ -776,25 +800,44 @@ tabs: Support.create_dialog: true settings-tab: panel_tabs: - user_info_tab: true - user_config_tab: false - user_quotas_tab: true - group_quotas_tab: true - user_accounting_tab: true - user_showback_tab: true + settings_info_tab: true + settings_config_tab: false + settings_quotas_tab: true + settings_group_quotas_tab: true + settings_accounting_tab: true + settings_showback_tab: true + settings_auth_tab: true actions: - # The buttons inside the settings-tab panel user_info_tab are - # configured with users-tab/actions; User.update_password and - # User.login_token - # - # Buttons for user_config_tab + # Buttons for settings_info_tab + User.update_password: true + User.login_token: true + # Buttons for settings_config_tab Settings.change_language: true Settings.change_password: true Settings.change_view: true Settings.ssh_key: true Settings.login_token: true - # Edit button in user_quotas_tab + # Edit button in settings_quotas_tab User.quotas_dialog: false upgrade-top-tab: panel_tabs: actions: + vmgroup-tab: + panel_tabs: + vm_group_info_tab: true + vm_group_vms_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Group + - 4 # Owner + - 5 # Vms + #- 6 # Labels + #- 7 # Search data + actions: + VMGroup.create_dialog: true + VMGroup.update_dialog: true + VMGroup.chmod: true + VMGroup.chown: true + VMGroup.chgrp: true \ No newline at end of file