Commit Graph

178 Commits

Author SHA1 Message Date
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
thomashaw
3205338f67 renamed postgresql database from secgen_batch to batch_secgen for consistency 2017-09-21 15:58:53 +01:00
thomashaw
abc7e28893 ovirt integration: removed ovirt-vmname option + build the vm name based on prefix and <system_name> 2017-09-21 15:44:23 +01:00
thomashaw
3fa05c0889 batch_secgen.rb: adding --randomise-ips 2017-09-21 15:44:23 +01:00
thomashaw
f42555350b secgen.rb: adding --network-ranges 2017-09-21 15:44:23 +01:00
thomashaw
447059ce20 WIP: templates in bases 2017-09-21 15:44:23 +01:00
thomashaw
f58fb0d2b4 WIP: ovirt templates -> bases 2017-09-21 15:44:23 +01:00
Gajendra
4ac2cd3ddc oVirt provider spinup with multiple options - ovirturl, ovirtpass, ovirtuser, ovirt-vmname, ovirtcluster, ovirttemplate etc 2017-09-21 15:44:23 +01:00
thomashaw
889c620189 secgen_batch: updated db interactions 2017-09-17 12:03:46 +01:00
thomashaw
1a611e230b SecGen batch processing script (requires postgresql).
secgen.rb: added --shutdown flag for shutting down vm's after provisioning
2017-09-15 15:54:50 +01:00
thomashaw
fa5015918b corrected method call 2017-09-05 12:31:17 +01:00
thomashaw
705383e108 encoder/random_string_selector: cleaned up print_string output. other encoders: added encoding print string padding 2017-09-05 11:26:29 +01:00
thomashaw
f86025f343 access_element removed (redundant, use access='0' instead) 2017-08-30 16:11:01 +01:00
thomashaw
bbb82382f7 Puppetfile.erb: enforce puppetlabs-stdlib 4.18.0 due to undefined resource problem in version 4.19.0 2017-08-23 13:53:40 +01:00
Z. Cliffe Schreuders
d6ced69c31 Fix calling rubygem executable on some platforms 2017-08-18 23:31:57 -07:00
thomashaw
ed31b4bf0f print.rb: added .warn and bright_yellow text colouring 2017-08-16 13:11:33 +01:00
thomashaw
f7a34f6e83 bugfix: added cpu_word_size to scenario schema - can re-run scenarios again 2017-08-14 14:16:39 +01:00
thomashaw
ee83e5016e structured_content: initial work, created an organisation generator. Organisation based scenarios need updating to use this.
datastore access_json:  can now access individual structured_content elements
2017-08-14 14:09:29 +01:00
thomashaw
f44680051e more vagrantfile.erb whitespace updates 2017-06-30 22:56:07 +01:00
thomashaw
76d7fa08ab vagrantfile.erb whitespace updates 2017-06-30 22:53:49 +01:00
thomashaw
7a6334fb00 PR_90 changes: added cpu_word_size to differentiate between 32/64bit systems in bases, refactored vagrantfile.erb to include this, changed windows 'config.vm.network' settings to use the system name rather than config. 2017-06-30 22:46:54 +01:00
thomashaw
534a780726 Merge remote-tracking branch 'origin/pr/90'
# Conflicts:
#	README.md
#	lib/templates/Vagrantfile.erb
2017-06-30 15:21:22 +01:00
thomashaw
1a5649fddf hint improvements 2017-06-24 00:19:52 +01:00