From 272bdb4ad359f2f7b8a809ec16b1e5df90695a66 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 20 Jan 2010 16:26:21 -0500 Subject: lots of shuffling around. more fully support old ec2-init.cfg and, add new preferred config file /etc/cloud/cloud.cfg. cloud.cfg is read, its values are overridden by the cloud-config data from user data --- ec2-init.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'ec2-init.py') diff --git a/ec2-init.py b/ec2-init.py index b483fd5d..4b4bd494 100755 --- a/ec2-init.py +++ b/ec2-init.py @@ -12,7 +12,6 @@ def warn(str): def main(): cloud = ec2init.EC2Init() - data = None try: cloud.get_data_source() except Exception as e: @@ -42,13 +41,6 @@ def main(): except: warn("failed to set defaults\n") - # set the ssh keys up - try: - cloud.sem_and_run("apply_credentials", "once-per-instance", - cloud.apply_credentials,[],False) - except: - warn("applying credentials failed!\n") - # enable swap try: cloud.sem_and_run("enable_swap", "once-per-instance", -- cgit v1.2.3