Z. Cliffe Schreuders
|
220c1f2ec1
|
lab update
|
2017-12-08 15:50:20 +00:00 |
|
Z. Cliffe Schreuders
|
9eebd1fd1e
|
lab update
|
2017-12-08 14:11:55 +00:00 |
|
Z. Cliffe Schreuders
|
2930d85917
|
lab update
|
2017-12-06 23:54:04 +00:00 |
|
thomashaw
|
d4c170508b
|
OVirtFunctions::get_ovirt_connection(): fixed
|
2017-11-11 16:33:50 +00:00 |
|
thomashaw
|
86ec04fc3d
|
Merge remote-tracking branch 'upstream/ids_rules_lab' into week_6_merge_branch
|
2017-11-10 10:57:24 +00:00 |
|
Z. Cliffe Schreuders
|
34be6e051f
|
lab update
|
2017-11-09 10:06:02 +00:00 |
|
thomashaw
|
667bf8c5aa
|
batch: cleanup
|
2017-11-06 13:20:06 +00:00 |
|
thomashaw
|
0111750afe
|
batch: reordered for consistency
|
2017-11-06 13:19:06 +00:00 |
|
thomashaw
|
c562e33c6e
|
batch: added list --success
|
2017-11-06 13:17:28 +00:00 |
|
thomashaw
|
a970ad5b45
|
batch: usage update
|
2017-11-06 13:15:38 +00:00 |
|
thomashaw
|
60f7618808
|
batch_secgen.rb: Threads have their own DB connections (fixes the message type 0xXX arrived from server while idle problem); List now accepts status types (e.g. --running, --failed/--error, --todo); and other minor tweaks
|
2017-11-06 13:05:09 +00:00 |
|
thomashaw
|
818752fef3
|
batch_secgen.rb: Threads have their own DB connections (fixes the message type 0xXX arrived from server while idle problem) --- test me w/ oVirt batch
|
2017-11-06 11:55:16 +00:00 |
|
thomashaw
|
0868b38516
|
oVirt retry loop (invalid credentials error): adding retries + catching connection exception
|
2017-11-03 14:01:45 +00:00 |
|
thomashaw
|
c6c319f4bc
|
oVirt retry loop: remove VMs that Vagrant created, but cannot find with destroy, via oVirt API
|
2017-11-03 11:57:15 +00:00 |
|
secgen server
|
16c99260ee
|
tests
|
2017-11-02 16:42:48 +00:00 |
|
thomashaw
|
87991f9f87
|
Retry loop improvements: pushing to test
|
2017-10-31 15:56:15 +00:00 |
|
thomashaw
|
de4a30b960
|
Retry loop improvements: pushing to test
|
2017-10-31 13:56:32 +00:00 |
|
thomashaw
|
2792221271
|
Retry loop improvements: pushing to test
|
2017-10-31 11:27:46 +00:00 |
|
thomashaw
|
94b72067d8
|
(oVirt) Minor fix for retry loop. Added timeout and proper handling.
|
2017-10-24 12:52:41 +01:00 |
|
thomashaw
|
c8aee26974
|
Merge remote-tracking branch 'upstream/ids_lab_squashed' into week_4_merge_branch
# Conflicts:
# lib/templates/Vagrantfile.erb
|
2017-10-21 10:52:02 +01:00 |
|
Z. Cliffe Schreuders
|
e78458c882
|
IDS lab
|
2017-10-20 16:52:17 +01:00 |
|
thomashaw
|
19cade10d3
|
Using process_helper gem instead of Open3.capture3 within gem_exec.rb so that vagrant up output is displayed in real-time.
|
2017-10-20 16:30:38 +01:00 |
|
thomashaw
|
08aad783df
|
Minor cleanup
|
2017-10-20 14:26:16 +01:00 |
|
thomashaw
|
8a0dceb12e
|
Minor changes to batch_secgen.rb
|
2017-10-20 13:03:13 +01:00 |
|
thomashaw
|
2172110037
|
batch_secgen: added README.md with setup instructions.
|
2017-10-20 13:02:54 +01:00 |
|
thomashaw
|
6e56a25be9
|
network changes cleanup - no need for <network/> changes
|
2017-10-18 15:03:26 +01:00 |
|
thomashaw
|
0033a7c642
|
network-ranges => scenario passthrough / rework
|
2017-10-18 14:57:53 +01:00 |
|
thomashaw
|
444d9ea9eb
|
batch_secgen: changed default option of random ip range exclusion to Y
|
2017-10-17 10:23:14 +01:00 |
|
secgen server
|
a95d957962
|
fixed destroy only broken vms
|
2017-10-13 16:20:24 +01:00 |
|
thomashaw
|
d62c15137f
|
Changes to retry destroy <failed_vm> and shortened hackerbot_server in system name to hb_server
|
2017-10-13 14:35:24 +01:00 |
|
thomashaw
|
fccd4e0b33
|
Only destroy broken VMs
|
2017-10-13 13:48:08 +01:00 |
|
secgen server
|
6b87f6ca31
|
pushing work from server
|
2017-10-13 11:47:39 +01:00 |
|
thomashaw
|
0d91381c15
|
WiP: wrap network_ranges check in conditional
|
2017-10-09 11:28:39 +01:00 |
|
thomashaw
|
3e1f9c9b46
|
batch_secgen: Added --all to reset command.
|
2017-10-07 14:17:54 +01:00 |
|
secgen server
|
606396a678
|
Merge branch 'labs_squashed_rwrk' of https://github.com/cliffe/SecGen into labs_squashed_rwrk
|
2017-10-07 11:40:53 +01:00 |
|
secgen server
|
ad8481b999
|
added sleep to batch
|
2017-10-07 11:40:49 +01:00 |
|
thomashaw
|
0ee163d729
|
batch_secgen: Added reset command. Reset all jobs with status 'running' or 'error' to 'todo'.
|
2017-10-07 11:36:05 +01:00 |
|
thomashaw
|
69cf1c57b8
|
added - and shorter server name for IRI labs
|
2017-10-05 15:11:50 +01:00 |
|
secgen server
|
7283d1979a
|
re-added environment to batch-secgen.service
|
2017-10-05 14:54:25 +01:00 |
|
thomashaw
|
46e4d26915
|
Vagrantfile.erb: Renamed SPICE => spice
|
2017-10-05 14:36:00 +01:00 |
|
thomashaw
|
7cfde8317a
|
Rework WIP: Testing changes so far. Still need to rework network-ranges passthrough hack with something more flexible.
|
2017-10-05 14:24:56 +01:00 |
|
thomashaw
|
7abaabe9b6
|
move <ovirt_template> next to basebox url in metadata and schema
|
2017-10-05 11:49:59 +01:00 |
|
thomashaw
|
2a7229e6fa
|
batch-secgen.service: added user & group to run service as
|
2017-10-05 11:48:20 +01:00 |
|
thomashaw
|
78ba59776a
|
batch_secgen: Automatically back up the projects/ directory of successful projects, added prompt on excluding ranges currently in table from randomised ip generation.
|
2017-10-05 11:47:26 +01:00 |
|
Z. Cliffe Schreuders
|
ce502abcdb
|
Hackerbot, labs, and associated changes
|
2017-09-28 16:35:28 +01:00 |
|
thomashaw
|
cef610bf04
|
oVirt now uses VM memory allocation based on command line options. Added missing options to usage. Added default memory allocations for oVirt VMs based on base type.
|
2017-09-28 15:32:47 +01:00 |
|
thomashaw
|
d43fe74492
|
Vagrantfile: oVirt hostname, replace _ with - in full hostname string, rather than just system_name. Fixes error when prefix contains underscores.
|
2017-09-28 13:47:22 +01:00 |
|
thomashaw
|
01baa313fc
|
ovirt-integration: reverting cloud-init change and included it in base template instead
|
2017-09-26 18:58:13 +01:00 |
|
thomashaw
|
8e38813db2
|
Updates: SecGen => oVirt Integration
|
2017-09-26 18:55:09 +01:00 |
|
thomashaw
|
0c13e77c23
|
Vagrantfile fix
|
2017-09-21 16:33:57 +01:00 |
|