Commit 71e6708f by Kevin Falcone

Don't pass down profile when it's unset

Pass down the region.
parent 60d5d9ea
...@@ -46,16 +46,19 @@ class LifecycleHandler: ...@@ -46,16 +46,19 @@ class LifecycleHandler:
os.environ["PATH"] = bin_directory + os.pathsep + os.environ["PATH"] os.environ["PATH"] = bin_directory + os.pathsep + os.environ["PATH"]
self.aws_bin = spawn.find_executable('aws') self.aws_bin = spawn.find_executable('aws')
self.python_bin = spawn.find_executable('python') self.python_bin = spawn.find_executable('python')
self.region = os.environ.get('AWS_REGION','us-east-1')
self.base_cli_command ="{python_bin} {aws_bin} --profile {profile} ".format( self.base_cli_command ="{python_bin} {aws_bin} ".format(
python_bin=self.python_bin, python_bin=self.python_bin,
aws_bin=self.aws_bin, aws_bin=self.aws_bin)
profile=self.profile) if self.profile:
self.base_cli_command += "--profile {profile} ".format(profile=self.profile)
if self.region:
self.base_cli_command += "--region {region} ".format(region=self.region)
region = os.environ.get('AWS_REGION','us-east-1')
self.dry_run = dry_run self.dry_run = dry_run
self.ec2_con = boto.ec2.connect_to_region(region) self.ec2_con = boto.ec2.connect_to_region(self.region)
self.sqs_con = boto.sqs.connect_to_region(region) self.sqs_con = boto.sqs.connect_to_region(self.region)
def process_lifecycle_messages(self): def process_lifecycle_messages(self):
queue = self.sqs_con.get_queue(self.queue) queue = self.sqs_con.get_queue(self.queue)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment