diff --git a/beeswithmachineguns/bees.py b/beeswithmachineguns/bees.py index c290e9f..05bf82c 100644 --- a/beeswithmachineguns/bees.py +++ b/beeswithmachineguns/bees.py @@ -207,7 +207,7 @@ def up(count, group, zone, image_id, instance_type, username, key_name, subnet, min_count=count, max_count=count, key_name=key_name, - security_group_ids=[groupId] if not subnet else None, + security_group_ids=[groupId], instance_type=instance_type, placement=placement, subnet_id=subnet) @@ -998,7 +998,8 @@ def _hurl_attack(params): options += ' -H \"Cookie: %s;\"' % params['cookies'] if params['basic_auth'] is not '': - options += ' -H \"Authorization : Basic %s\"' % params['basic_auth'] + auth = base64.encodestring(params['basic_auth']).replace('\n', '') + options += ' -H \"Authorization : Basic %s\"' % auth if params['seconds']: options += ' -l %d' % params['seconds']