From 97fc9d2fb994d136574a5da1e8524f203f3403ff Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Fri, 23 Jun 2017 11:08:15 +0000 Subject: [PATCH] fedimg: update the cron a/c to libcloud 2.0.0 Signed-off-by: Sayan Chowdhury --- roles/fedimg/files/cron/kill_ec2_nodes.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/roles/fedimg/files/cron/kill_ec2_nodes.py b/roles/fedimg/files/cron/kill_ec2_nodes.py index 4bfb96c5b8..c325e698a8 100644 --- a/roles/fedimg/files/cron/kill_ec2_nodes.py +++ b/roles/fedimg/files/cron/kill_ec2_nodes.py @@ -12,7 +12,6 @@ from libcloud.compute.providers import get_driver import datetime import fedimg - EC2_ACCESS_ID = fedimg.AWS_ACCESS_ID EC2_SECRET_KEY = fedimg.AWS_SECRET_KEY @@ -22,8 +21,8 @@ def kill_all_instances(region): :param region: AWS region """ - cls = get_driver(region) - driver = cls(EC2_ACCESS_ID, EC2_SECRET_KEY) + cls = get_driver(Provider.EC2) + driver = cls(EC2_ACCESS_ID, EC2_SECRET_KEY, region=region) nodes = driver.list_nodes() for n in nodes: d1 = datetime.datetime.strptime(n.extra['launch_time'], '%Y-%m-%dT%H:%M:%S.000Z') @@ -34,9 +33,7 @@ def kill_all_instances(region): if __name__ == '__main__': - regions = [Provider.EC2_AP_NORTHEAST, Provider.EC2_AP_SOUTHEAST, - Provider.EC2_AP_SOUTHEAST2, Provider.EC2_EU_WEST, - Provider.EC2_SA_EAST, Provider.EC2_US_EAST, - Provider.EC2_US_WEST, Provider.EC2_US_WEST_OREGON] + regions = set([metadata.split('|')[0] + for metadata in fedimg.AWS_AMIS.split('\n')]) for region in regions: kill_all_instances(region)