Commit Graph
1260 Commits
Author SHA1 Message Date
Carlos Martín d969e98588 Merge remote-tracking branch 'origin/master' into feature-3175
Conflicts:
	src/sunstone/public/js/plugins/vms-tab.js
2014-12-11 14:53:16 +01:00
Ruben S. Montero c48ec4b20c bug #3377: Add default port for CEPH and GLUSTER if not specified 2014-12-11 13:21:50 +01:00
Carlos Martín 77aaa332a9 Merge remote-tracking branch 'origin/master' into feature-3175
Conflicts:
	include/NebulaUtil.h
	install.sh
	src/common/NebulaUtil.cc
	src/onedb/local/4.9.80_to_4.11.80.rb
	src/sunstone/public/js/plugins/templates-tab.js
	src/sunstone/public/js/sunstone.js
2014-12-10 17:28:52 +01:00
Ruben S. Montero 9acff41c0f feature #3331: Generate a master key file to encrypt data in the DB (.one/one_key). Encrypt VCENTER_PASSWORD in host template. VCenter driver derypts the password using the master key
(cherry picked from commit 8016908d3b)

Conflicts:
	src/vmm_mad/remotes/vcenter/vcenter_driver.rb
2014-11-26 23:15:28 +01:00
Carlos Martín b5867d8f52 Feature #3175: Add default SG in onedb migrator 2014-11-21 11:55:14 +01:00
Carlos Martín a529276b6d Merge remote-tracking branch 'origin/master' into feature-3175
Conflicts:
	src/sunstone/public/js/plugins/vnets-tab.js
2014-11-20 15:50:52 +01:00
Ruben S. Montero c6aa3d2234 feature #3175: Solves memory leaks. Add SG 0 to new networks 2014-11-20 15:14:45 +01:00
Ruben S. Montero 958da49fc6 feature #3331: Generate a master key file to encrypt data in the DB (.one/one_key). Encrypt VCENTER_PASSWORD in host template. VCenter driver derypts the password using the master key
(cherry picked from commit 8016908d3b)

Conflicts:
	src/vmm_mad/remotes/vcenter/vcenter_driver.rb
2014-11-19 12:01:33 +01:00
Ruben S. Montero 3f2ad72cb0 feature #3175: Check security group consistency 2014-11-13 16:00:03 +01:00
Carlos Martín ded633b813 Feature #3264: Report errors in VMPool::calculate_showback 2014-11-12 15:35:18 +01:00
Ruben S. Montero f7d9d69206 feature #3175: Do not duplicate SG information 2014-11-11 18:52:06 +01:00
Ruben S. Montero 461a448c15 feature #3175: Review VirtualMachine method scope 2014-11-11 16:42:49 +01:00
Ruben S. Montero 18786ec0e6 feature #3175: Cache SECURITY_GROUP parsing 2014-11-11 16:27:46 +01:00
Ruben S. Montero ae7f8e8631 feature #3175: Copy security group rules by reference 2014-11-11 16:26:34 +01:00
Carlos Martín 3725a640ec Feature #3264: Create new db table in onedb migrator 2014-11-07 15:50:33 +01:00
Carlos Martín a5aa72359a Feature #3264: calculate-showback uses month,year
And lots of bugs fixed
2014-11-06 18:27:17 +01:00
Carlos Martín 8198887ca2 Feature #3264: Move float_to_str to NebulaUtil 2014-11-06 18:27:17 +01:00
Carlos Martín 8d6af8f282 Feature #3264: showback start and end time are now set as month,year 2014-11-06 13:21:21 +01:00
Ruben S. Montero 0ad8c9dc49 feature #3175: Rename split method 2014-11-05 18:45:54 +01:00
Carlos Martín d2cc25ba8e Feature #3264: Add a method to calculate the showback data 2014-11-04 18:46:14 +01:00
Carlos Martín 5c30484027 Merge remote-tracking branch 'origin/master' into feature-3264 2014-11-04 17:48:06 +01:00
Carlos Martín 004c13cec8 Merge remote-tracking branch 'origin/master' into feature-3175
Conflicts:
	src/sunstone/public/css/app.css
	src/sunstone/public/js/plugins/vnets-tab.js
2014-10-31 17:36:31 +01:00
Ruben S. Montero 62b241df28 feature #3175: Move AR attributes for SG to class constants 2014-10-31 16:57:54 +01:00
Carlos Martín 2dfa16ab79 Feature #3264: Init calculate_showback stime from DB values 2014-10-30 17:46:44 +01:00
Carlos Martín be6dfcf8f0 Feature #3264: Method to dump showback records 2014-10-30 17:45:32 +01:00
Carlos Martín 68bac3a897 Feature #3264: New method VMPool::calculate_showback 2014-10-30 17:21:27 +01:00
Jaime Melis 7fdd1bc91a Bump version to 4.10.0 2014-10-29 17:32:29 +01:00
Ruben S. Montero cc1dc8cb70 Custom format string to log xml-rpc calls 2014-10-28 18:52:48 +01:00
Ruben S. Montero c27984b1bb change scope of log method 2014-10-28 17:40:30 +01:00
Ruben S. Montero aef7109af3 Hide password arguments for user login. General hidden process 2014-10-28 16:23:09 +01:00
Carlos Martín f97743eae9 Merge remote-tracking branch 'origin/master' into feature-3175
Conflicts:
	src/sunstone/public/js/plugins/templates-tab.js
	src/sunstone/public/js/sunstone.js
2014-10-24 13:32:19 +02:00
Carlos Martín 930c13ae76 Bug #3168: process attributes in update --append 2014-10-20 16:15:06 +02:00
Carlos Martín 863b82bb0b Feature #3175: onedb migrator to add SG table 2014-10-17 15:28:15 +02:00
Carlos Martín 9a816c7b57 Feature #3175: Fix bug in SG clone 2014-10-16 17:10:52 +02:00
Carlos Martín fb0473d5cd Merge remote-tracking branch 'origin/master' into feature-3175 2014-10-10 18:36:40 +02:00
Carlos Martín fba2dfc653 Feature #3175: Better security group ID management 2014-10-10 16:53:57 +02:00
Carlos Martín 76218309bc Feature #3175: Core support for RULE/NETWORK_ID
Each rule is copied once for each vnet's AR
2014-10-10 16:52:51 +02:00
Javi Fontan dc4bab8519 Bump version to 4.9.80 2014-10-10 15:48:16 +02:00
Ruben S. Montero d6abae89db bug #3212: Move VMs to poweroff if the were running last time we got monitor data from the host. Move VMs to running if they are recovered. Remove unused code for vmware_driver 2014-10-09 16:24:24 +02:00
Carlos Martín 49495f5e54 Merge remote-tracking branch 'origin/master' into feature-3175 2014-10-08 17:14:00 +02:00
Ruben S. Montero d16ebc60d9 Fix Update Template for empty restricted attributes 2014-10-06 17:14:00 +02:00
Carlos Martín 49b94d12ea Merge remote-tracking branch 'origin/master' into feature-3175
Conflicts:
	install.sh
2014-10-03 15:55:29 +02:00
Carlos Martín 58810f41ee Feature #3167: Make the restricted attributes apply only to reservations 2014-09-29 18:27:19 +02:00
Carlos Martín f61d896a9a Feature #3183: New migrator to add vnet column 2014-09-29 12:25:08 +02:00
Ruben S. Montero ef510dfcd0 feature #3183: Do not include reservations in VNET/* and VNET/% rules for pool list and vnet show API calls 2014-09-23 20:19:14 +02:00
Ruben S. Montero 3df4f4f995 Fix access control for VNET reservations with group Resource Providers 2014-09-17 17:05:01 +02:00
Ruben S. Montero dcd2e80281 feature #3183:Extend VNET to_xml method to list only VM and VNET information granted by the ACL system 2014-09-11 17:01:14 +02:00
Ruben S. Montero 7afeaaaa5d feature #3183: Add search methods to VNET and VM Pools 2014-09-11 17:01:13 +02:00
Carlos Martín 79c0a8071f Feature #3175: Copy the Sec Group rules to the VM Template 2014-09-10 18:59:10 +02:00
Carlos Martín ed167a8661 Feature #3175: Sec groups store the VMs using them 2014-09-09 18:13:52 +02:00