diff --git a/install.sh b/install.sh index ef7a2133c6..41971bc1b4 100755 --- a/install.sh +++ b/install.sh @@ -1428,7 +1428,6 @@ SUNSTONE_ETC_FILES="src/sunstone/etc/sunstone-server.conf \ SUNSTONE_ETC_VIEW_FILES="src/sunstone/etc/sunstone-views/admin.yaml \ src/sunstone/etc/sunstone-views/user.yaml \ src/sunstone/etc/sunstone-views/cloud.yaml \ - src/sunstone/etc/sunstone-views/provision.yaml \ src/sunstone/etc/sunstone-views/vdcadmin.yaml" SUNSTONE_MODELS_FILES="src/sunstone/models/OpenNebulaJSON.rb \ diff --git a/src/sunstone/etc/sunstone-views.yaml b/src/sunstone/etc/sunstone-views.yaml index 035229eec7..af63c4b334 100644 --- a/src/sunstone/etc/sunstone-views.yaml +++ b/src/sunstone/etc/sunstone-views.yaml @@ -28,6 +28,5 @@ groups: - vdcadmin - user - cloud - - provision default: - - user + - cloud diff --git a/src/sunstone/etc/sunstone-views/cloud.yaml b/src/sunstone/etc/sunstone-views/cloud.yaml index 7eb8af37af..ff7bf8ef45 100644 --- a/src/sunstone/etc/sunstone-views/cloud.yaml +++ b/src/sunstone/etc/sunstone-views/cloud.yaml @@ -1,14 +1,14 @@ small_logo: images/opennebula-sunstone-v4.0-small.png enabled_tabs: - dashboard-tab: true + dashboard-tab: false system-tab: false users-tab: false groups-tab: false acls-tab: false vresources-tab: false - vms-tab: true + vms-tab: false templates-tab: false - images-tab: true + images-tab: false files-tab: false infra-tab: false clusters-tab: false @@ -19,6 +19,7 @@ enabled_tabs: oneflow-dashboard: false oneflow-services: false oneflow-templates: false + provision-tab: true tabs: dashboard-tab: panel_tabs: @@ -431,3 +432,6 @@ tabs: ServiceTemplate.chgrp: false ServiceTemplate.chmod: true ServiceTemplate.delete: true + provision-tab: + panel_tabs: + actions: diff --git a/src/sunstone/etc/sunstone-views/provision.yaml b/src/sunstone/etc/sunstone-views/provision.yaml deleted file mode 100644 index ff7bf8ef45..0000000000 --- a/src/sunstone/etc/sunstone-views/provision.yaml +++ /dev/null @@ -1,437 +0,0 @@ -small_logo: images/opennebula-sunstone-v4.0-small.png -enabled_tabs: - dashboard-tab: false - system-tab: false - users-tab: false - groups-tab: false - acls-tab: false - vresources-tab: false - vms-tab: false - templates-tab: false - images-tab: false - files-tab: false - infra-tab: false - clusters-tab: false - hosts-tab: false - datastores-tab: false - vnets-tab: false - marketplace-tab: false - oneflow-dashboard: false - oneflow-services: false - oneflow-templates: false - provision-tab: true -tabs: - dashboard-tab: - panel_tabs: - actions: - widgets_three_per_row: - #- users - widgets_two_per_row: - #- network - #- storage - #- hosts - #- vms - widgets_one_per_row: - - vms - system-tab: - panel_tabs: - actions: - users-tab: - panel_tabs: - user_info_panel: true - user_quotas_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Group - - 4 # Auth driver - - 5 # VMs - - 6 # Memory - - 7 # CPU - #- 8 # Group ID - actions: - User.refresh: true - User.create_dialog: true - User.update_password: true - User.quotas_dialog: true - User.chgrp: true - User.addgroup: true - User.delgroup: true - User.chauth: true - User.delete: true - groups-tab: - panel_tabs: - group_quotas_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Name - - 3 # Users - - 4 # VMs - - 5 # Memory - - 6 # CPU - actions: - Group.refresh: true - Group.create_dialog: true - Group.quotas_dialog: true - Group.delete: true - acls-tab: - panel_tabs: - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Applies to - - 3 # Affected resources - - 4 # Resource ID / Owned by - - 5 # Allowed operations - - 6 # Zone - #- 7 # ACL String - actions: - Acl.refresh: true - Acl.create_dialog: true - Acl.delete: true - vresources-tab: - panel_tabs: - actions: - vms-tab: - panel_tabs: - vm_info_tab: true - vm_capacity_tab: true - vm_hotplugging_tab: true - vm_network_tab: true - vm_snapshot_tab: true - vm_placement_tab: false - vm_actions_tab: true - vm_template_tab: false - vm_log_tab: false - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Status - #- 6 # Used CPU - #- 7 # Used Memory - - 8 # Host - - 9 # IPs - #- 10 # Start Time - - 11 # VNC - actions: - VM.refresh: true - VM.create_dialog: false - VM.easy_provision: true - VM.chown: false - VM.chgrp: false - VM.chmod: true - VM.deploy: false - VM.migrate: false - VM.migrate_live: false - VM.hold: true - VM.release: true - VM.suspend: true - 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.resize: false - VM.attachdisk: true - VM.detachdisk: true - VM.saveas: true - VM.attachnic: false - VM.detachnic: false - VM.snapshot_create: true - VM.snapshot_revert: true - VM.snapshot_delete: true - VM.resched: false - VM.unresched: false - 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 - actions: - Template.refresh: true - Template.create_dialog: false - Template.easy_provision: 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 - other: false - images-tab: - panel_tabs: - image_info_panel: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time - #- 9 # Persistent - - 10 # Status - - 11 # #VMs - #- 12 # Target - actions: - Image.refresh: true - Image.create_dialog: false - Image.chown: false - Image.chgrp: false - Image.chmod: false - Image.enable: false - Image.disable: false - Image.persistent: true - Image.nonpersistent: true - Image.clone_dialog: false - Image.delete: true - files-tab: - panel_tabs: - file_info_panel: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Datastore - #- 6 # Size - - 7 # Type - #- 8 # Registration time - #- 9 # Persistent - - 10 # Status - #- 11 # #VMs - #- 12 # Target - actions: - File.refresh: true - File.create_dialog: true - File.chown: false - File.chgrp: false - File.chmod: true - File.enable: true - File.disable: true - File.delete: true - infra-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 - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Capacity - - 6 # Cluster - #- 7 # Basepath - #- 8 # TM - #- 9 # DS - #- 10 # Type - 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_leases_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # Cluster - - 6 # Type - #- 7 # Bridge - - 8 # Leases - actions: - Network.refresh: true - Network.create_dialog: false - Network.addtocluster: false - Network.chown: false - Network.chgrp: false - Network.chmod: true - Network.delete: false - Network.addleases: false - Network.hold_lease: false - Network.remove_lease: false - Network.release_lease: false - marketplace-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 - oneflow-dashboard: - 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 - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - - 5 # State - actions: - Service.refresh: true - Service.chown: false - Service.chgrp: false - Service.chmod: true - Service.shutdown: true - Service.recover: true - Service.delete: true - oneflow-templates: - panel_tabs: - service_template_info_panel: true - service_template_roles_tab: true - table_columns: - - 0 # Checkbox - - 1 # ID - - 2 # Owner - - 3 # Group - - 4 # Name - actions: - ServiceTemplate.refresh: true - ServiceTemplate.create_dialog: true - ServiceTemplate.instantiate: true - ServiceTemplate.chown: false - ServiceTemplate.chgrp: false - ServiceTemplate.chmod: true - ServiceTemplate.delete: true - provision-tab: - panel_tabs: - actions: