mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-12 09:17:41 +03:00
Revert "B #2331: No way for hide Lock/Unlock button for VM in Sunstone view"
Remove comments from oned.conf
This reverts commit cf56a20fa0
.
This commit is contained in:
parent
b63db14feb
commit
600b954b3a
@ -236,8 +236,6 @@ DEFAULT_COST = [
|
||||
# %g -- group id
|
||||
# %G -- group name
|
||||
# %a -- auth token
|
||||
# %A -- Request IP address
|
||||
# %P -- Request PORT
|
||||
# %% -- %
|
||||
#*******************************************************************************
|
||||
|
||||
|
@ -246,8 +246,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -400,8 +398,6 @@ tabs:
|
||||
VM.unresched: true
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -639,8 +635,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -699,8 +693,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -777,8 +769,6 @@ tabs:
|
||||
Network.add_ar: true
|
||||
Network.remove_ar: true
|
||||
Network.update_ar: true
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -868,5 +858,3 @@ tabs:
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
|
@ -81,8 +81,6 @@ tabs:
|
||||
VM.disk_snapshot_revert: true
|
||||
VM.disk_snapshot_delete: true
|
||||
VM.save_as_template: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
dashboard:
|
||||
# Connected user's quotas
|
||||
quotas: true
|
||||
|
@ -245,8 +245,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -399,8 +397,6 @@ tabs:
|
||||
VM.unresched: false
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: false
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -483,8 +479,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: false
|
||||
VirtualRouter.detachnic: false
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -640,8 +634,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -700,8 +692,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -778,8 +768,6 @@ tabs:
|
||||
Network.add_ar: false
|
||||
Network.remove_ar: false
|
||||
Network.update_ar: false
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -869,5 +857,3 @@ tabs:
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
|
@ -238,8 +238,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -392,8 +390,6 @@ tabs:
|
||||
VM.unresched: false
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -476,8 +472,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: true
|
||||
VirtualRouter.detachnic: true
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -633,8 +627,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -693,8 +685,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -771,8 +761,6 @@ tabs:
|
||||
Network.add_ar: false
|
||||
Network.remove_ar: true
|
||||
Network.update_ar: true
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -861,6 +849,4 @@ tabs:
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
VMGroup.chgrp: true
|
@ -246,8 +246,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -400,8 +398,6 @@ tabs:
|
||||
VM.unresched: true
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -484,8 +480,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: true
|
||||
VirtualRouter.detachnic: true
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -641,8 +635,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -701,8 +693,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -779,8 +769,6 @@ tabs:
|
||||
Network.add_ar: true
|
||||
Network.remove_ar: true
|
||||
Network.update_ar: true
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -870,5 +858,3 @@ tabs:
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
|
@ -81,8 +81,6 @@ tabs:
|
||||
VM.disk_snapshot_revert: true
|
||||
VM.disk_snapshot_delete: true
|
||||
VM.save_as_template: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
dashboard:
|
||||
# Connected user's quotas
|
||||
quotas: true
|
||||
|
@ -245,8 +245,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -399,8 +397,6 @@ tabs:
|
||||
VM.unresched: false
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: false
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -483,8 +479,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: false
|
||||
VirtualRouter.detachnic: false
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -640,8 +634,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -700,8 +692,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -778,8 +768,6 @@ tabs:
|
||||
Network.add_ar: false
|
||||
Network.remove_ar: false
|
||||
Network.update_ar: false
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -869,5 +857,3 @@ tabs:
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
|
@ -238,8 +238,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -392,8 +390,6 @@ tabs:
|
||||
VM.unresched: false
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -476,8 +472,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: true
|
||||
VirtualRouter.detachnic: true
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -633,8 +627,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -693,8 +685,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -771,8 +761,6 @@ tabs:
|
||||
Network.add_ar: false
|
||||
Network.remove_ar: true
|
||||
Network.update_ar: true
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -861,6 +849,4 @@ tabs:
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
VMGroup.chgrp: true
|
@ -244,8 +244,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: false
|
||||
Template.unshare: false
|
||||
Template.lockU: true
|
||||
Template.unlock: false
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -398,8 +396,6 @@ tabs:
|
||||
VM.unresched: true
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -482,8 +478,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: true
|
||||
VirtualRouter.detachnic: true
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -639,8 +633,6 @@ tabs:
|
||||
Image.snapshot_flatten: false
|
||||
Image.snapshot_revert: false
|
||||
Image.snapshot_delete: false
|
||||
Image.lockU: true
|
||||
Image.unlock: false
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -699,8 +691,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -777,8 +767,6 @@ tabs:
|
||||
Network.add_ar: true
|
||||
Network.remove_ar: true
|
||||
Network.update_ar: true
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -868,5 +856,3 @@ tabs:
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
|
@ -82,8 +82,6 @@ tabs:
|
||||
VM.disk_snapshot_revert: true
|
||||
VM.disk_snapshot_delete: true
|
||||
VM.save_as_template: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
dashboard:
|
||||
# Connected user's quotas
|
||||
quotas: true
|
||||
|
@ -245,8 +245,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -399,8 +397,6 @@ tabs:
|
||||
VM.unresched: false
|
||||
VM.save_as_template: false
|
||||
VM.updateconf: false
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -483,8 +479,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: false
|
||||
VirtualRouter.detachnic: false
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -640,8 +634,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -700,8 +692,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -778,8 +768,6 @@ tabs:
|
||||
Network.add_ar: false
|
||||
Network.remove_ar: false
|
||||
Network.update_ar: false
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -868,6 +856,4 @@ tabs:
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
VMGroup.chgrp: true
|
@ -238,8 +238,6 @@ tabs:
|
||||
Template.delete_dialog: true
|
||||
Template.share: true
|
||||
Template.unshare: true
|
||||
Template.lockU: true
|
||||
Template.unlock: true
|
||||
Template.edit_labels: true
|
||||
Template.menu_labels: true
|
||||
template_creation_tabs:
|
||||
@ -392,8 +390,6 @@ tabs:
|
||||
VM.unresched: false
|
||||
VM.save_as_template: true
|
||||
VM.updateconf: true
|
||||
VM.lockU: true
|
||||
VM.unlock: true
|
||||
VM.edit_labels: true
|
||||
VM.menu_labels: true
|
||||
oneflow-services-tab:
|
||||
@ -476,8 +472,6 @@ tabs:
|
||||
VirtualRouter.delete: true
|
||||
VirtualRouter.attachnic: true
|
||||
VirtualRouter.detachnic: true
|
||||
VirtualRouter.lockU: true
|
||||
VirtualRouter.unlock: true
|
||||
VirtualRouter.edit_labels: true
|
||||
VirtualRouter.menu_labels: true
|
||||
infrastructure-top-tab:
|
||||
@ -633,8 +627,6 @@ tabs:
|
||||
Image.snapshot_flatten: true
|
||||
Image.snapshot_revert: true
|
||||
Image.snapshot_delete: true
|
||||
Image.lockU: true
|
||||
Image.unlock: true
|
||||
Image.edit_labels: true
|
||||
Image.menu_labels: true
|
||||
files-tab:
|
||||
@ -693,8 +685,6 @@ tabs:
|
||||
MarketPlace.chgrp: true
|
||||
MarketPlace.chmod: true
|
||||
MarketPlace.delete: true
|
||||
MarketPlace.lockU: true
|
||||
MarketPlace.unlock: true
|
||||
MarketPlace.edit_labels: true
|
||||
MarketPlace.menu_labels: true
|
||||
marketplaceapps-tab:
|
||||
@ -771,8 +761,6 @@ tabs:
|
||||
Network.add_ar: false
|
||||
Network.remove_ar: true
|
||||
Network.update_ar: true
|
||||
Network.lockU: true
|
||||
Network.unlock: true
|
||||
Network.edit_labels: true
|
||||
Network.menu_labels: true
|
||||
vnets-topology-tab:
|
||||
@ -861,6 +849,4 @@ tabs:
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
VMGroup.lockU: true
|
||||
VMGroup.unlock: true
|
||||
VMGroup.chgrp: true
|
Loading…
Reference in New Issue
Block a user