From 2822dd5727acc059d1c49bac2a3c1c1eec208eb8 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 7 Sep 2016 10:40:14 +0200 Subject: [PATCH] Correction des messages CreoleLint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Retour de la filelist dans la condition disable_if_in - Suppression d'un template qui n'existe plus - Mise à jour du template user.yaml pour être compatible avec la version 5.0.2 ref #16991 @1h --- dicos/99_one-frontend.xml | 17 +- tmpl/user.yaml | 814 ++++++++++++++++++++++++++------------ tmpl/vdcadmin.yaml | 21 - 3 files changed, 570 insertions(+), 282 deletions(-) delete mode 100644 tmpl/vdcadmin.yaml diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml index e53a5fa..1c48d4a 100644 --- a/dicos/99_one-frontend.xml +++ b/dicos/99_one-frontend.xml @@ -2,13 +2,14 @@ opennebula-sunstone - - - - - - - + + + + + + + + 443 @@ -94,7 +95,7 @@ non - + onefrontend port_sunstone vnc_proxy_port_sunstone xmlrpc_port_sunstone diff --git a/tmpl/user.yaml b/tmpl/user.yaml index 4e86869..3374d38 100644 --- a/tmpl/user.yaml +++ b/tmpl/user.yaml @@ -1,91 +1,123 @@ -small_logo: images/opennebula-sunstone-v4.0-small.png -provision_logo: images/one_small_logo.png +%set oneflow = %%getVar('activer_oneflow','non') == 'oui' +small_logo: images/opennebula-5.0.png +provision_logo: images/opennebula-5.0.png enabled_tabs: - dashboard-tab: true - system-tab: false - users-tab: false - groups-tab: false - acls-tab: false - vresources-tab: true - vms-tab: true - templates-tab: true - images-tab: true - files-tab: true - infra-tab: true - clusters-tab: false - hosts-tab: false - datastores-tab: true - vnets-tab: true -%if %%getVar('activer_market_place', 'non') - marketplace-tab: true + - dashboard-tab + - instances-top-tab + - vms-tab +%if %%oneflow + - oneflow-services-tab %end if -%if %%getVar('activer_oneflow', 'non') == 'oui' - oneflow-dashboard: true - oneflow-services: true - oneflow-templates: true -%else - oneflow-dashboard: false - oneflow-services: false - oneflow-templates: false + - vrouters-tab + - templates-top-tab + - templates-tab +%if %%oneflow + - oneflow-templates-tab %end if -%if %%getVar('activer_market_views', 'non') == 'oui' - apptools-appmarket-dashboard: true - apptools-appmarket-appliances: true -%end if - support-tab: false - doc-tab: false - community-tab: false - enterprise-tab: false + - vrouter-templates-tab + - storage-top-tab + - datastores-tab + - images-tab + - files-tab + - marketplaces-tab + - marketplaceapps-tab + - network-top-tab + - vnets-tab + - vnets-topology-tab + - secgroups-tab + #- infrastructure-top-tab + #- clusters-tab + #- hosts-tab + #- zones-tab + #- system-top-tab + #- users-tab + #- groups-tab + #- vdcs-tab + #- acls-tab + - settings-tab + #- support-tab + #- upgrade-top-tab autorefresh: true +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: true + + # 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: false tabs: dashboard-tab: + # The following widgets can be used inside any of the '_per_row' settings + # bellow. As the name suggest, the widgets will be scaled to fit one, + # two, or three per row. The footer uses the widgets at full size, i.e. + # one per row. + # + # - storage + # - users + # - network + # - hosts + # - vms + # - groupquotas + # - quotas panel_tabs: actions: Dashboard.refresh: false Sunstone.toggle_top: false + widgets_one_per_row: + - vms widgets_three_per_row: - #- users widgets_two_per_row: - network - storage - - user_quotas - - group_quotas - #- hosts - #- vms - widgets_one_per_row: - - vms widgets_one_footer: - - accounting - system-tab: + system-top-tab: panel_tabs: actions: users-tab: panel_tabs: user_info_tab: true user_quotas_tab: true + user_groups_tab: true + user_accounting_tab: true + user_showback_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Name - 3 # Group - 4 # Auth driver - - 5 # VMs - - 6 # Memory - - 7 # CPU - #- 8 # Group ID + #- 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: true User.chgrp: true - User.addgroup: true - User.delgroup: true - User.chauth: true + User.change_authentication: true User.delete: true + User.edit_labels: true + User.menu_labels: true groups-tab: panel_tabs: + group_info_tab: true + group_users_tab: true group_quotas_tab: true + group_accounting_tab: true + group_showback_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -94,11 +126,39 @@ tabs: - 4 # VMs - 5 # Memory - 6 # CPU + #- 7 # Labels actions: Group.refresh: true Group.create_dialog: true + Group.update_dialog: true Group.quotas_dialog: true Group.delete: true + Group.edit_admins: true + Group.edit_labels: true + Group.menu_labels: true + vdcs-tab: + panel_tabs: + vdc_info_tab: true + vdc_groups_tab: true + vdc_resources_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Groups + - 4 # Clusters + - 5 # Hosts + - 6 # VNets + - 7 # Datastores + #- 8 # Labels + actions: + Vdc.refresh: true + Vdc.create_dialog: true + Vdc.update_dialog: true + Vdc.rename: true + Vdc.delete: true + Vdc.edit_labels: true + Vdc.menu_labels: true acls-tab: panel_tabs: table_columns: @@ -114,18 +174,129 @@ tabs: Acl.refresh: true Acl.create_dialog: true Acl.delete: true - vresources-tab: + templates-top-tab: + panel_tabs: + actions: + templates-tab: + panel_tabs: + template_info_tab: true + template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + #- 7 # Search data + actions: + Template.refresh: true + Template.create_dialog: true + Template.import_dialog: false + Template.update_dialog: true + Template.instantiate_vms: true + Template.rename: true + Template.chown: false + Template.chgrp: false + Template.chmod: true + Template.clone_dialog: true + Template.delete_dialog: true + Template.share: true + Template.unshare: true + Template.edit_labels: true + Template.menu_labels: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: false + hybrid: true + other: true +%if %%oneflow + oneflow-templates-tab: + panel_tabs: + service_template_info_tab: true + service_template_roles_tab: true + service_template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + #- 5 # Labels + #- 6 # Search data + actions: + ServiceTemplate.refresh: true + ServiceTemplate.create_dialog: true + ServiceTemplate.update_dialog: true + ServiceTemplate.instantiate: true + ServiceTemplate.chown: false + ServiceTemplate.chgrp: false + ServiceTemplate.chmod: true + ServiceTemplate.rename: true + ServiceTemplate.clone_dialog: true + ServiceTemplate.delete: true + ServiceTemplate.edit_labels: true + ServiceTemplate.menu_labels: true +%end if + vrouter-templates-tab: + panel_tabs: + vrouter_template_info_tab: true + vrouter_template_template_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Registration time + #- 6 # Labels + #- 7 # Search data + actions: + VirtualRouterTemplate.refresh: true + VirtualRouterTemplate.create_dialog: true + VirtualRouterTemplate.update_dialog: true + VirtualRouterTemplate.instantiate_dialog: true + VirtualRouterTemplate.rename: true + VirtualRouterTemplate.chown: false + VirtualRouterTemplate.chgrp: false + VirtualRouterTemplate.chmod: true + VirtualRouterTemplate.clone_dialog: true + VirtualRouterTemplate.delete_dialog: true + VirtualRouterTemplate.share: true + VirtualRouterTemplate.unshare: true + VirtualRouterTemplate.edit_labels: true + VirtualRouterTemplate.menu_labels: true + template_creation_tabs: + general: true + storage: true + network: true + os_booting: true + features: true + input_output: true + context: true + scheduling: true + hybrid: true + other: true + instances-top-tab: panel_tabs: actions: vms-tab: panel_tabs: vm_info_tab: true vm_capacity_tab: true - vm_hotplugging_tab: true + vm_storage_tab: true vm_network_tab: true vm_snapshot_tab: true vm_placement_tab: false vm_actions_tab: true + vm_conf_tab: true vm_template_tab: false vm_log_tab: false table_columns: @@ -141,9 +312,13 @@ tabs: - 9 # IPs #- 10 # Start Time - 11 # VNC + #- 12 # Hidden Template + #- 13 # Labels + #- 14 # Search data actions: VM.refresh: true VM.create_dialog: true + VM.rename: true VM.chown: false VM.chgrp: false VM.chmod: true @@ -156,62 +331,235 @@ tabs: VM.resume: true VM.stop: true VM.recover: false - VM.boot: true VM.reboot: true VM.reboot_hard: true VM.poweroff: true VM.poweroff_hard: true VM.undeploy: true VM.undeploy_hard: true - VM.shutdown: true - VM.shutdown_hard: true - VM.delete: true - VM.delete_recreate: true + VM.terminate: true + VM.terminate_hard: true VM.resize: true VM.attachdisk: true VM.detachdisk: true - VM.saveas: true + VM.disk_saveas: true VM.attachnic: true VM.detachnic: true VM.snapshot_create: true VM.snapshot_revert: true VM.snapshot_delete: true + VM.disk_snapshot_create: true + VM.disk_snapshot_revert: true + VM.disk_snapshot_delete: true VM.resched: false VM.unresched: false - templates-tab: + VM.save_as_template: true + VM.updateconf: true + VM.edit_labels: true + VM.menu_labels: true +%if %%oneflow + oneflow-services-tab: panel_tabs: - template_info_tab: true - template_template_tab: true + service_info_tab: true + service_roles_tab: true + service_log_tab: true + panel_tabs_actions: + service_roles_tab: + Role.scale: true + Role.hold: true + Role.release: true + Role.suspend: true + Role.resume: true + Role.stop: true + Role.reboot: true + Role.reboot_hard: true + Role.poweroff: true + Role.poweroff_hard: true + Role.undeploy: true + Role.undeploy_hard: true + Role.terminate: true + Role.terminate_hard: true + RoleVM.hold: true + RoleVM.release: true + RoleVM.suspend: true + RoleVM.resume: true + RoleVM.stop: true + RoleVM.reboot: true + RoleVM.reboot_hard: true + RoleVM.poweroff: true + RoleVM.poweroff_hard: true + RoleVM.undeploy: true + RoleVM.undeploy_hard: true + RoleVM.terminate: true + RoleVM.terminate_hard: true + RoleVM.resched: false + RoleVM.unresched: false + RoleVM.recover: false table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # Registration time + - 5 # State + #- 6 # Labels + #- 7 # Search data actions: - Template.refresh: true - Template.create_dialog: true - Template.update_dialog: true - Template.instantiate_vms: true - Template.chown: false - Template.chgrp: false - Template.chmod: true - Template.clone_dialog: true - Template.delete: true - template_creation_tabs: - general: true - storage: true - network: true - os_booting: true - features: true - input_output: true - context: true - scheduling: false + Service.refresh: true + Service.create_dialog: true + Service.chown: false + Service.chgrp: false + Service.chmod: true + Service.rename: true + Service.shutdown: true + Service.recover: true + Service.delete: true + 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 # 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 + infrastructure-top-tab: + panel_tabs: + actions: + clusters-tab: + panel_tabs: + cluster_info_tab: true + cluster_host_tab: true + cluster_vnet_tab: true + cluster_datastore_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Hosts + - 4 # VNets + - 5 # Datastores + #- 6 # Labels + actions: + Cluster.refresh: true + Cluster.create_dialog: true + Cluster.update_dialog: true + Cluster.delete: true + Cluster.rename: true + Cluster.edit_labels: true + Cluster.menu_labels: true + hosts-tab: + panel_tabs: + host_info_tab: true + host_monitoring_tab: true + host_vms_tab: true + host_wilds_tab: true + host_zombies_tab: true + host_esx_tab: true + host_pci_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Cluster + - 4 # RVMs + #- 5 # Real CPU + - 6 # Allocated CPU + #- 7 # Real MEM + - 8 # Allocated MEM + - 9 # Status + #- 10 # IM MAD + #- 11 # VM MAD + #- 12 # Last monitored on + #- 13 # Labels + #- 14 # Search data + actions: + Host.refresh: true + Host.create_dialog: true + Host.addtocluster: true + Host.rename: true + Host.enable: true + Host.disable: true + Host.offline: true + Host.delete: true + Host.edit_labels: true + Host.menu_labels: true + zones-tab: + panel_tabs: + zone_info_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Name + - 3 # Endpoint + #- 4 # Labels + actions: + Zone.refresh: true + Zone.create_dialog: true + Zone.rename: true + Zone.delete: true + Zone.edit_labels: true + Zone.menu_labels: true + storage-top-tab: + panel_tabs: + actions: + datastores-tab: + panel_tabs: + datastore_info_tab: false + datastore_image_tab: true + datastore_clusters_tab: false + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + - 5 # Capacity + - 6 # Cluster + #- 7 # Basepath + #- 8 # TM + #- 9 # DS + #- 10 # Type + #- 11 # Status + #- 12 # Labels + #- 13 # Search data + actions: + Datastore.refresh: true + Datastore.create_dialog: false + Datastore.import_dialog: false + Datastore.addtocluster: false + Datastore.rename: true + Datastore.chown: false + Datastore.chgrp: false + Datastore.chmod: true + Datastore.delete: false + Datastore.enable: false + Datastore.disable: false + Datastore.edit_labels: true + Datastore.menu_labels: true images-tab: panel_tabs: image_info_tab: true image_vms_tab: true + image_snapshots_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -226,9 +574,14 @@ tabs: - 10 # Status - 11 # #VMs #- 12 # Target + #- 13 # Labels + #- 14 # Search data actions: Image.refresh: true Image.create_dialog: true + Image.import_dialog: false + Image.upload_marketplace_dialog: true + Image.rename: true Image.chown: false Image.chgrp: false Image.chmod: true @@ -238,6 +591,11 @@ tabs: Image.nonpersistent: true Image.clone_dialog: true Image.delete: true + Image.snapshot_flatten: true + Image.snapshot_revert: true + Image.snapshot_delete: true + Image.edit_labels: true + Image.menu_labels: true files-tab: panel_tabs: file_info_tab: true @@ -255,65 +613,24 @@ tabs: - 10 # Status #- 11 # #VMs #- 12 # Target + #- 13 # Labels + #- 14 # Search data actions: File.refresh: true File.create_dialog: true + File.rename: true File.chown: false File.chgrp: false File.chmod: true File.enable: true File.disable: true File.delete: true - infra-tab: + File.edit_labels: true + File.menu_labels: true + marketplaces-tab: panel_tabs: - actions: - clusters-tab: - panel_tabs: - cluster_info_tab: true - cluster_host_tab: true - cluster_vnet_tab: true - cluster_datastore_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Hosts - - 4 # VNets - - 5 # Datastores - actions: - Cluster.refresh: true - Cluster.create_dialog: true - Cluster.update_dialog: true - Cluster.delete: true - hosts-tab: - panel_tabs: - host_info_tab: true - host_monitoring_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Cluster - - 4 # RVMs - #- 5 # Real CPU - - 6 # Allocated CPU - #- 7 # Real MEM - - 8 # Allocated MEM - - 9 # Status - #- 10 # IM MAD - #- 11 # VM MAD - #- 12 # Last monitored on - actions: - Host.refresh: true - Host.create_dialog: true - Host.addtocluster: true - Host.enable: true - Host.disable: true - Host.delete: true - datastores-tab: - panel_tabs: - datastore_info_tab: false - datastore_image_tab: true + marketplace_info_tab: true + marketplace_apps_tab: true table_columns: - 0 # Checkbox - 1 # ID @@ -321,25 +638,66 @@ tabs: - 3 # Group - 4 # Name - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - #- 10 # Type - + - 6 # Apps + - 7 # Driver + - 8 # Zone + #- 9 # Labels + #- 10 # Search data + actions: + MarketPlace.refresh: true + MarketPlace.create_dialog: true + MarketPlace.update_dialog: true + MarketPlace.rename: true + MarketPlace.chown: true + MarketPlace.chgrp: true + MarketPlace.chmod: true + MarketPlace.delete: true + MarketPlace.edit_labels: true + MarketPlace.menu_labels: true + marketplaceapps-tab: + panel_tabs: + marketplaceapp_info_tab: true + marketplaceapp_templates_tab: true + table_columns: + - 0 # Checkbox + - 1 # ID + - 2 # Owner + - 3 # Group + - 4 # Name + #- 5 # Version + - 6 # Size + - 7 # State + #- 8 # Type + - 9 # Registration + - 10 # Marketplace + - 11 # Zone + #- 12 # Labels + #- 13 # Search data + actions: + MarketPlaceApp.refresh: true + MarketPlaceApp.create_dialog: true + MarketPlaceApp.download_opennebula_dialog: true + MarketPlaceApp.download_local: true + MarketPlaceApp.rename: true + MarketPlaceApp.chown: true + MarketPlaceApp.chgrp: true + MarketPlaceApp.chmod: true + MarketPlaceApp.enable: true + MarketPlaceApp.disable: true + MarketPlaceApp.delete: true + MarketPlaceApp.edit_labels: true + MarketPlaceApp.menu_labels: true + network-top-tab: + panel_tabs: actions: - Datastore.refresh: true - Datastore.create_dialog: false - Datastore.addtocluster: false - Datastore.chown: false - Datastore.chgrp: false - Datastore.chmod: true - Datastore.delete: false vnets-tab: panel_tabs: - vnet_info_tab: false + vnet_info_tab: true vnet_ar_list_tab: true vnet_leases_tab: true + vnet_sg_list_tab: true + vnet_vr_list_tab: true + vnet_clusters_tab: false table_columns: - 0 # Checkbox - 1 # ID @@ -351,10 +709,16 @@ tabs: #- 7 # Bridge - 8 # Leases #- 9 # VLAN ID + #- 10 # Labels + #- 11 # Search data actions: Network.refresh: true Network.create_dialog: false + Network.import_dialog: false + Network.update_dialog: true + Network.reserve_dialog: true Network.addtocluster: false + Network.rename: true Network.chown: false Network.chgrp: false Network.chmod: true @@ -363,130 +727,74 @@ tabs: Network.release_lease: true Network.add_ar: false Network.remove_ar: true - Network.update_ar: false - marketplace-tab: + Network.update_ar: true + Network.edit_labels: true + Network.menu_labels: true + vnets-topology-tab: panel_tabs: - marketplace_info_tab: true - table_columns: - - 0 # Checkbox - #- 1 # ID - - 2 # Name - - 3 # Publisher - - 4 # Hypervisor - - 5 # Arch - - 6 # Format - #- 7 # Tags actions: - Marketplace.refresh: true - Marketplace.import: true -%if %%getVar('activer_oneflow', 'non') == 'oui' - oneflow-dashboard: + NetworkTopology.refresh: true + NetworkTopology.fit: true + NetworkTopology.collapseVMs: true + NetworkTopology.openVMs: true + secgroups-tab: panel_tabs: - table_columns: - actions: - oneflow-services: - panel_tabs: - service_info_tab: true - service_roles_tab: true - service_log_tab: true - panel_tabs_actions: - service_roles_tab: - Role.scale: true - Role.hold: true - Role.release: true - Role.suspend: true - Role.resume: true - Role.stop: true - Role.boot: true - Role.reboot: true - Role.reboot_hard: true - Role.poweroff: true - Role.poweroff_hard: true - Role.shutdown: true - Role.shutdown_hard: true - Role.delete: true - Role.delete_recreate: true - RoleVM.hold: true - RoleVM.release: true - RoleVM.suspend: true - RoleVM.resume: true - RoleVM.stop: true - RoleVM.boot: true - RoleVM.reboot: true - RoleVM.reboot_hard: true - RoleVM.poweroff: true - RoleVM.poweroff_hard: true - RoleVM.undeploy: true - RoleVM.undeploy_hard: true - RoleVM.shutdown: true - RoleVM.shutdown_hard: true - RoleVM.delete: true - RoleVM.delete_recreate: true - RoleVM.resched: false - RoleVM.unresched: false - RoleVM.recover: false + security_group_info_tab: true + security_group_vms_tab: true table_columns: - 0 # Checkbox - 1 # ID - 2 # Owner - 3 # Group - 4 # Name - - 5 # State + #- 5 # Labels + #- 6 # Search data actions: - Service.refresh: true - Service.chown: false - Service.chgrp: false - Service.chmod: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates: + SecurityGroup.refresh: true + SecurityGroup.create_dialog: true + SecurityGroup.update_dialog: true + SecurityGroup.rename: true + SecurityGroup.chown: true + SecurityGroup.chgrp: true + SecurityGroup.chmod: true + SecurityGroup.clone_dialog: true + SecurityGroup.commit_dialog: true + SecurityGroup.delete: true + SecurityGroup.edit_labels: true + SecurityGroup.menu_labels: true + support-tab: panel_tabs: - service_template_info_tab: true - service_template_roles_tab: true + support_info_tab: true table_columns: - - 0 # Checkbox + #- 0 # Checkbox - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name + - 2 # Subject + - 3 # Created at + - 4 # Status actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: true - ServiceTemplate.instantiate: true - ServiceTemplate.chown: false - ServiceTemplate.chgrp: false - ServiceTemplate.chmod: true - ServiceTemplate.delete: true -%end if -%if %%getVar('activer_market_views', 'non') == 'oui' - apptools-appmarket-dashboard: + Support.refresh: true + Support.create_dialog: true + settings-tab: panel_tabs: - table_columns: + user_info_tab: true + user_config_tab: false + user_quotas_tab: true + group_quotas_tab: true + user_accounting_tab: true + user_showback_tab: true actions: - apptools-appmarket-appliances: + # 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 + 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 + upgrade-top-tab: panel_tabs: - appmarketplace_info_tab: true - appmarketplace_jobs_tab: false - appmarketplace_template_tab: true - panel_tabs_actions: - appmarketplace_jobs_tab: - Job.del: false - table_columns: - - 0 # Checkbox - #- 1 # ID - - 2 # Name - #- 3 # Status - - 4 # Publisher - - 5 # Hypervisor - - 6 # Arch - - 7 # Format - #- 8 # Tags - - 9 # Created actions: - AppMarket.refresh: true - AppMarket.import: true - AppMarket.delete: false - AppMarket.convert: false - AppMarket.create_dialog: false -%end if diff --git a/tmpl/vdcadmin.yaml b/tmpl/vdcadmin.yaml deleted file mode 100644 index 5b4c412..0000000 --- a/tmpl/vdcadmin.yaml +++ /dev/null @@ -1,21 +0,0 @@ -provision_logo: images/one_small_logo.png -enabled_tabs: - provision-tab: true -tabs: - provision-tab: - panel_tabs: - users: true -%if %%getVar('activer_oneflow', 'non') == 'oui' - flows: true -%else - flows: false -%end if - actions: - Template.chmod: true - Template.delete: true - dashboard: - quotas: false - vms: false - vdcquotas: true - vdcvms: true - users: true