Commit graph

772 commits

Author SHA1 Message Date
Michael Stahnke
3393c3243d Merge pull request #24 from sschneid/update_license
Update license holder
2014-08-27 11:55:51 -07:00
Scott Schneider
5078f8f1a0 Increase sleep time = decrease CPU usage 2014-08-26 18:09:55 -07:00
Scott Schneider
0b447eac57 Update license holder 2014-08-26 18:08:59 -07:00
Roger Ignazio
07de2f7f23 Merge pull request #23 from sschneid/configurable_host_lifetime
Correctly log a VM's lifetime
2014-08-22 13:40:51 -07:00
Scott Schneider
c41d8dc3e2 Correctly log a VM's lifetime 2014-08-22 13:35:18 -07:00
Roger Ignazio
65c1908c4e Merge pull request #22 from sschneid/configurable_host_lifetime
Configurable host lifetimes
2014-08-22 11:45:05 -07:00
Scott Schneider
092d035a3d Adding docs for PUT modifications
Also: cleaning up a little bit.
2014-08-22 11:38:02 -07:00
Scott Schneider
b836ceea90 Custom-set VM lifetimes override system-wide 2014-08-22 11:04:38 -07:00
Scott Schneider
3dbbb39a3b Allow a PUT to modify running VMs 2014-08-22 11:03:55 -07:00
Heath Seals
cddf7e77e6 Merge pull request #21 from sschneid/clone_target
Allow a 'clone_target' configuration setting
2014-07-28 13:01:39 -05:00
Scott Schneider
76ef04c100 Fixing typo 2014-07-28 10:55:42 -07:00
Scott Schneider
e8125e7702 Allow a 'clone_target' configuration setting
If set, this setting will enable "fake DRS", cloning VMs onto the host
in the specified cluster containing the least amount of VMs.
2014-07-28 10:51:45 -07:00
Colin
1d6f3037f8 Merge pull request #20 from sschneid/dont_use_resource_pools_for_organization
Don't use VMware resource pools for organization
2014-07-25 15:08:18 -07:00
Scott Schneider
4f3c5323d8 Don't use VMware resource pools for organization
This commit removes support for VMware 'resource pool' functionality
entirely, as VMware installations without the DRS feature enabled are
unable to configure or use resource pools.

Also, resource pools should have never been used for organization;
that's what folders are for.
2014-07-21 13:49:57 -07:00
Colin
5df75c8bf7 Merge pull request #18 from sschneid/move_stats_to_header
Tweaks to views and CSS to move statistics to header
2014-07-21 11:36:58 -07:00
Colin
dffed6e9d5 Merge pull request #19 from sschneid/backwards-compatible_json
Revive the per-pool 'ok' JSON response until beaker can be patched
2014-07-21 11:24:04 -07:00
Scott Schneider
29715a3d7e Revive the per-pool 'ok' JSON response until beaker can be patched 2014-07-21 10:54:48 -07:00
Scott Schneider
cd9d7d984f Alignment/spacing tweaks 2014-07-21 10:46:42 -07:00
Scott Schneider
1839ff467a Tweaks to views and CSS to move statistics to header 2014-07-16 11:59:57 -07:00
Scott Schneider
cd7f18b334 Update logo path in README 2014-06-10 10:34:26 -07:00
Scott Schneider
0d31a43339 Merge pull request #17 from sschneid/development
Merge 'development' branch
2014-06-10 10:32:02 -07:00
Scott Schneider
31e9f525e1 Updating API documentation 2014-06-10 10:15:58 -07:00
Scott Schneider
9f80e699e4 s/Authors/Authors and Contributors/ 2014-06-10 10:07:45 -07:00
Scott Schneider
88fa77b067 Merge pull request #16 from sschneid/batch-requests
Batch requests
2014-06-09 16:13:39 -07:00
Scott Schneider
d6b6f83fc7 Support batch (multiple VM) requests
This PR allows a single API request to return multiple VM objects.  It
supports the following formats:

- POST <json> /vm/
  eg. 'curl -d '{"debian-7-i386":"3","debian-7-x86_64":"1"}' --url vmpooler/vm

- POST /vm/<pool>+<pool>+<pool>...
  eg. 'curl -d --url vmpooler/vm/debian-7-i386+debian-7-i386+debian-7-i386+debian-7-x86_64

Both commands listed above will return a JSON hash of 3 debian-7-i386 VMs and
1 debian-7-x86_64 VM:

  {
    "ok": true,
    "debian-7-i386": {
      "hostname": [
        "v49pwwk5yzg6oad",
        "ylghlgote5uso54",
        "wt0c4xovvulo7ge"
      ]
    },
    "debian-7-x86_64": {
      "hostname": "v3dkrulttp360fm"
    }
  }
2014-06-09 15:15:05 -07:00
Scott Schneider
61cdf3e2ad Longer naps for main process 2014-06-09 10:36:17 -07:00
Scott Schneider
677531686a Add screenshot to README 2014-03-12 12:25:51 -07:00
Scott Schneider
f5e32ff41a Revert "Add screenshot to README"
This reverts commit 50e5a5238c.
2014-03-12 12:25:06 -07:00
Scott Schneider
bdff6e3743 Add screenshot to README 2014-03-12 12:24:29 -07:00
Scott Schneider
1f5fb0e442 Revert "Add screenshot to README"
This reverts commit 30d3566aff.
2014-03-12 12:23:38 -07:00
Scott Schneider
82acd3348b Add screenshot to README 2014-03-12 12:22:31 -07:00
Scott Schneider
7a50fa56e1 Merge branch 'textured_svg_area' into development 2014-03-11 12:51:53 -07:00
Scott Schneider
0bf996bbd8 Merge branch 'configurable_graphite_namespace' into development 2014-03-11 12:51:32 -07:00
Scott Schneider
30b5402498 Merge branch 'single_namespaced_app' into development 2014-03-11 12:51:24 -07:00
Scott Schneider
4b3b05ee37 Add textured backgrounds to SVG area pathes 2014-03-11 12:49:42 -07:00
Scott Schneider
3af680f860 Allow a configurable Graphite namespace (prefix) 2014-03-06 10:53:27 -08:00
Scott Schneider
401f8f8ffd Merge branch 'single_namespaced_app' into development 2014-03-05 14:04:08 -08:00
Scott Schneider
60eead6455 Centralize external Gem loading 2014-03-05 13:19:43 -08:00
Scott Schneider
60cc1ef178 Reworked into a single namespaced Ruby application 2014-03-05 12:57:25 -08:00
Scott Schneider
e0ac8c735f Revert "@media queries make the world go 'round"
This reverts commit e730b41a03.
2014-03-05 09:45:01 -08:00
Scott Schneider
d9e8fc9647 Label update 2014-03-04 21:41:51 -08:00
Scott Schneider
6a3acd5def Merge pull request #15 from sschneid/css_media_queries
@media queries make the world go 'round
2014-03-04 21:22:22 -08:00
Scott Schneider
86febda607 @media queries make the world go 'round 2014-03-04 21:21:04 -08:00
Scott Schneider
77700dbfc5 Merge pull request #14 from sschneid/readme
Add an initial README file
2014-03-04 18:08:08 -08:00
Scott Schneider
6e8e61e0e7 Merge branch 'master' into name_change
Conflicts:
	vmpooler-api
2014-03-04 17:59:26 -08:00
Scott Schneider
b458f70d13 Merge pull request #10 from sschneid/trailing_slash_optional
Allow optional trailing slash
2014-03-03 14:25:49 -08:00
Scott Schneider
7efafd25df Fix filename typo 2014-02-21 13:53:09 -08:00
Scott Schneider
d5862e8064 s/vm_host_pool__/vmpooler__/g 2014-02-20 14:39:17 -08:00
Scott Schneider
82058bbceb Merge branch 'master' into name_change 2014-02-20 14:38:10 -08:00
Scott Schneider
cca063dc0f Merge pull request #13 from sschneid/hostname_check
Add a check to 'check_ready_vm' to make sure hostname still matches
2014-02-20 14:36:06 -08:00