Commit Graph
882 Commits
Author SHA1 Message Date
Carlos Martín 60f0d4bfbd Feature #1697: Change Template::merge to replace and add attributes
This allows to merge a template with repeated attributes, like
several DISK or NIC atts.
2013-02-15 16:07:15 +01:00
Simon Boulet 3deeec215a Feature #1697: Initial commit for user supplied Attributes on one.template.instantiate 2013-02-15 14:58:58 +01:00
Javi Fontan 1a712ed5a7 Change Util.h to NebulaUtil.h
In MacOS X Util.h caused problems compiling tty_expect as the filesystem
is not case sensitive by default and there is a /usr/include/util.h.
2013-02-12 12:15:09 +01:00
Javi Fontan 562561c6ed feature #1766: SysLog support selectable at build time 2013-02-11 19:06:20 +01:00
Ruben S. Montero 3f0e3e8470 Merge branch 'feature-1483' 2013-02-08 22:13:57 +01:00
Ruben S. Montero d920864c6a Revert "feature #1483: Inline hints for simple util functions"
This reverts commit 2e72c6c68b.
2013-02-08 21:58:34 +01:00
Ruben S. Montero 2e72c6c68b feature #1483: Inline hints for simple util functions 2013-02-08 21:51:30 +01:00
Ruben S. Montero 4e41c91022 feature #1483: Moved implementation of util functions to a cc file 2013-02-08 21:50:40 +01:00
Ruben S. Montero 2391713df0 feature #1483: Add a separated action VM pool 2013-02-07 00:14:25 +01:00
Carlos Martín 92ccbd83fb Feature #1483 #1556: Leave SCHED_REQUIREMENTS and SCHED_RANK in the USER_TEMPLATE, so they can be edited 2013-02-06 16:34:46 +01:00
Carlos Martín c483e7bba0 Feature #1483 #1556: VM attributes understood by opennebula are moved to TEMPLATE, the rest are left in USER_TEMPLATE 2013-02-06 15:23:55 +01:00
Carlos Martín 3b01566e9b Feature #1483: Create new Util.h file to define common methods, like creating log timestamp strings 2013-02-04 18:48:05 +01:00
Ruben S. Montero 6ed2e75657 Merge branch 'feature-1658'
Conflicts:
	src/scheduler/src/sched/Scheduler.cc
	src/scheduler/src/sched/SchedulerTemplate.cc
2013-02-01 19:03:31 +01:00
Ruben S. Montero b924b8c81f feature #1658: Moved init methods to constructors (static). Make use of log system enums for type cheking. Use the same LOG variables as oned for scheduler. 2013-02-01 18:49:03 +01:00
Jaime Melis 7217b53cc2 feature #1658: the syslog label is now a parameter for the syslog init method and it's not hardcoded inside of it 2013-01-31 23:08:50 +01:00
Jaime Melis 50160c50c7 feature #1658: Move DEBUG_LEVEL and LOG_SYSTEM to the LOG section in oned.conf 2013-01-31 20:43:17 +01:00
Jaime Melis 32f8098f8b Feature #1658: Add SysLogResource class and refactor 2013-01-31 17:27:21 +01:00
Carlos Martín cdb2a8a476 Feature #846: Add methods to update the VM template from the sched and log messages 2013-01-30 17:49:24 +01:00
Jaime Melis 2e487cdbbc Feature #1658: Enable syslog for oned.log
- LOG_SYSTEM in oned.conf
- SysLog class
2013-01-25 17:34:43 +01:00
Ruben S. Montero 99a24ac04a Merge branch 'master' of git.opennebula.org:one 2013-01-24 17:25:44 +01:00
Jaime Melis 7357bffe34 Update copyright notice 2013-01-24 16:18:30 +01:00
Jaime Melis af61e33f8c Update year to 2013 2013-01-24 16:03:57 +01:00
Ruben S. Montero b4afe64b61 Merge branch 'master' of git.opennebula.org:one 2013-01-23 22:13:42 +01:00
Carlos Martín 185f05a273 Feature #1565: Clean ACL rules when a Cluster is deleted 2013-01-23 16:46:14 +01:00
Carlos Martín eeac62263c Merge remote-tracking branch 'origin/feature-1685b' 2013-01-23 15:38:07 +01:00
Ruben S. Montero e5d540def9 Merge branch 'feature-1554' 2013-01-23 11:43:05 +01:00
Ruben S. Montero 1a657d9268 Merge branch 'feature-1565'
Conflicts:
	src/pool/PoolObjectSQL.cc
2013-01-22 21:16:10 +01:00
Ruben S. Montero 382f1f722b feature #1565: Check resource types for CLUSTER based ACLs 2013-01-22 20:57:42 +01:00
Ruben S. Montero dc9a6711e0 Merge branch 'feature-1681' 2013-01-22 15:41:10 +01:00
Ruben S. Montero c5044cd51b feature #1681: Conversions from string to mask (binary) are made in User::get_umask 2013-01-22 15:37:07 +01:00
Carlos Martín afc4cddfd5 Feature #1554: New method ObjectXML::add_node 2013-01-22 14:14:56 +01:00
Carlos Martín 780d7742f2 Feature #1681: Read User template's UMASK attribute to create new objects 2013-01-21 14:38:07 +01:00
Ruben S. Montero e4544c42b8 feature #1685: CLEANUP_PREVIOUS action to cleanup previous hosts for migrate operations. Integrate CLEANUP actions with LCM. New state CLEANUP_DELETE. 2013-01-21 12:27:18 +01:00
Ruben S. Montero 6c50f2b147 feature #1685: Clean network in CLEANUP. Adds cleanup_action to VMM. Make use of new action in LCM 2013-01-21 00:15:46 +01:00
Ruben S. Montero 41789046a6 feature #1685: Epilog delete commands are generated in a separated function 2013-01-20 23:05:14 +01:00
Carlos Martín d4245a6699 Feature #1681: Add new oned.conf att. for a default umask 2013-01-18 18:34:51 +01:00
Ruben S. Montero d797d04a88 feature #1449: Adds the IMMUTABLE persistent_type. This means that a persistent image will not be cloned and will not be modified, thus READONLY = YES and SAVE = NO 2013-01-17 23:14:34 +01:00
Carlos Martín c3bbc983ca Bug #1733: Change onehost update method rights to ADMIN 2013-01-17 15:52:02 +01:00
Carlos Martín dafbc5d349 Feature #1565: Implement reverse search for ACLs that apply to objects in a cluster 2013-01-17 12:33:33 +01:00
Carlos Martín 1b6e38dac1 Feature #1565: Add new ACL resource ID bit, '%', for clusters. The reserve lookup is pending 2013-01-16 18:27:36 +01:00
Carlos Martín 9e0a06468e Merge remote-tracking branch 'origin/feature-1556' 2013-01-09 12:24:25 +01:00
Carlos Martín 97efc55004 Bug #1698: Automatically trim trailing spaces in NAME attributes 2013-01-08 18:34:08 +01:00
Ruben S. Montero 8a2597cd90 feature #1556: Add a new user template to the VM to store user defined variables. Add OCA Ruby & JAVA bindings for the new update method. Add command option for onevm tool. 2013-01-04 00:04:01 +01:00
Ruben S. Montero c9dc8c47da Merge branch 'bug-1694' 2012-12-24 14:25:41 +01:00
Ruben S. Montero c523b889f1 Revert "Bug #1694: If a DS updates its type to system_ds, update the cluster system_ds"
This reverts commit ca4504f984.
2012-12-24 12:27:53 +01:00
Ruben S. Montero 02208c5676 feature #1103: Always deal with boolean values from oned.conf in the same way 2012-12-24 02:41:17 +01:00
Ruben S. Montero fdb5f09e89 Revert "Feature #1326: VMs instantiated from a template are named template_name-<vmid>"
This reverts commit 8e80bfcf66.
2012-12-23 23:31:00 +01:00
Carlos Martín 8e80bfcf66 Feature #1326: VMs instantiated from a template are named template_name-<vmid> 2012-12-21 13:50:10 +01:00
Carlos Martín 406877743e Feature #1103: Finish integrating the new oned.conf att. VM_SUBMIT_ON_HOLD 2012-12-20 18:57:20 +01:00
Carlos Martín 85678cbba8 Merge branch 'submit-on-hold'
Conflicts:
	src/rm/RequestManagerAllocate.cc
	src/rm/RequestManagerVMTemplate.cc
2012-12-20 18:35:59 +01:00